finish chapter 12
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	src/chapter12/usa.html
	src/chapter12/world.html