Made slightly less ugly
Merge branch 'master' of https://github.com/slowteetoe/bewarethefreeze

Conflicts:
	app/controllers/welcome_controller.rb