programmer hacking styles, sorry
Merge branch 'master' of github.com:boonrs/h4h_restore

Conflicts:
	app/views/layouts/application.html.erb