Add logging
Merge branch 'master' of https://github.com/kmorrison/caltech into scoring_non_interview_event
right side scrolling and centering
Lunch break start
Merge branch 'master' of github.com:kmorrison/caltech into lunch_break_is_back
Merge branch 'master' of github.com:kmorrison/caltech into lunch_break_is_back
Merge branch 'master' of https://github.com/kmorrison/caltech into scoring_non_interview_event
Lunch break back in
scoring non interview event
Merge branch 'master' of https://github.com/kmorrison/caltech into scoring_non_interview_event
User auth working
Merge branch 'master' of github.com:kmorrison/caltech into lunch_break_is_back
Add template tags and can do onsite
Merge conflicts
Merge branch 'master' of https://github.com/kmorrison/caltech into alanq_modify_google_plus_style

Conflicts:
	templates/tracker.html
fix