8.1.1 complete
Up to 8.2.5
Merge branch 'chapter-8'

Conflicts:
	app/views/layouts/application.html.erb