Promo home page layout and CSS
Merge branch 'master' of https://github.com/ashleybaxter/lodger

Conflicts:
	app/assets/stylesheets/application.css
	app/controllers/promo_controller.rb