battery running out
Merge branch 'master' of github.com:nrmilstein/cs4750-project
add authentication and make some templating/css changes