Setting paths
Merge branch 'master' into filling-in-layout

Conflicts:
	app/views/static_pages/home.html.erb
	config/routes.rb
	spec/requests/static_pages_spec.rb