Working on authentication
Merge branch 'master' of https://github.com/jdehlin/ITS-Hackday1

Conflicts:
	app.js