I don't know why I'm commiting but my shell told me to do so.
Merge branch 'master' of https://github.com/ahrekar/Simplicity

Conflicts:
	devDb.h2.db
	web-app/css/index.css
I belive they are insync now.
Fixed assignment alignment and changed the button style a little bit.