Chapter 3
Merge branch 'filling-in-layout'

Conflicts:
	.rspec
	Gemfile
	app/views/static_pages/contact.html.erb
	spec/spec_helper.rb