Add HTML differences
Merge branch 'static-pages-exercises'

Conflicts:
	app/views/static_pages/contact.html.erb
	app/views/static_pages/home.html.erb
	config/routes.rb