Fuck you greg ill commit what I want
I made settings really sexy.
Merge branch 'master' of https://github.com/goakley/centivize

Conflicts:
	public/style/main.css
Merge branch 'master' of https://github.com/goakley/centivize

Conflicts:
	public/app.html
	public/style/main.css