commiting part way through chapter 5
forgot to commit these
Merge branch 'Review' and had my first merge conflict!

Conflicts:
	app/views/static_pages/home.html.erb