2 tests written. One passing.
CSS changes to display
Minor CSS change
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