add controler
finish static
layout and routes
Merge branch 'filling-in-layout'

Conflicts:
	Gemfile.lock
	app/controllers/static_pages_controller.rb
	app/views/layouts/application.html.erb
	app/views/static_pages/home.html.erb
	app/views/static_pages/home.html.erb~
	config/routes.rb~
	spec/requests/static_pages_spec.rb
	spec/requests/static_pages_spec.rb~