saving to look at merge conflict
Merge branch 'master' of github.com:ColorTurtle/TimeBandit-Venture

Conflicts:
	app/index.html
	app/scripts/main.js
Merge branch 'master' of github.com:ColorTurtle/TimeBandit-Venture into jens-work
fixed a bunch of mainjs, added keypress, logout working
Merge pull request #5 from ColorTurtle/jens-work

Jens work
Merged master into branch. Program functioning, but styling lost on messages.