Layout design
Merge branch 'filling-in-layout'

Conflicts:
	app/assets/stylesheets/global.css
	app/views/layouts/application.html.erb