initial step bis
partial changes
Finish layout and routes
Merge branch 'filling-in-layout'

Conflicts:
	app/views/layouts/application.html.erb
	app/views/static_pages/contact.html.erb
	app/views/static_pages/home.html.erb
	config/routes.rb
	test/controllers/static_pages_controller_test.rb