initial formatting commit
Merge branch 'master' into formatting

Conflicts:
	app/views/layout.erb
looking better
testing branch stuff-formatting branch
Merge branch 'master' into formatting