css beautification
Merge branch 'master' into pre-final-cssing

Conflicts:
	app/views/layouts/application.html.erb
Merge pull request #49 from tidydee/pre-final-cssing

css beautification