Fixed Merge Conflict

static/custom.css

@@ -45,8 +45,11 @@ ul.nav {
   padding-top: 30px;
 }
 
+.datepicker {
+  z-index: 2000;
+}
+
 .textarea {
 	margin-top: 20px;
 	margin-bottom: 20px;
 }
-

ticket_app.py

@@ -50,14 +50,14 @@ def signup(user_models, user_string, next_url='/'):
                            request.form.get('confirm_password'))
         db.session.add(user)
         db.session.commit()
+        session[user_string] = str(user.id)
     except models.UserError as e:
         flash(str(e))
     return redirect(next_url)
 
 
 def logout(user_string, next_url='/'):
     del session[user_string]
-    flash("You are Logged Out!")
     return redirect(next_url)
 
 
@@ -132,11 +132,13 @@ def delete_event(event_id):
     db.session.delete(event_del)
     session.commit()
 
+
 @app.route("/group_event/<event_id>", methods=['GET'])
 def group_view_event(event_id):
     event = models.Event.query.get(event_id)
     return render_template('group_view_event.html', event=event)
 
+
 @app.route("/event/<event_id>/purchase", methods=['POST'])
 def attending_event(event_id):
     student = get_model(models.Student, 'student')
@@ -166,6 +168,7 @@ def leader_board():
             happening.append(event)
     return render_template('leaderboard.html', leaders=this_week)
 
+
 def datetime_to_str(date):
     frmt = "%I:%M %p, %m/%d/%y"
     return date.strftime(frmt)