Finished chapter12
Finished chapter13
Merge branch 'dev'

Conflicts:
	README.md
	app/controllers/orders_controller.rb
	test/fixtures/line_items.yml
	test/fixtures/orders.yml
	test/functional/orders_controller_test.rb