User auth working
Merge branch 'master' of github.com:kmorrison/caltech into lunch_break_is_back
Merge conflicts