Merge branch 'master' into filling-in-layout

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.erb
	spec/requests/static_pages_spec.rb