Finished chapter13
Study in the chapter14
Finished chapter14
Merge branch 'dev'

Conflicts:
	README.md
	app/mailers/oder_notifier.rb
	test/functional/oder_notifier_test.rb
	test/integration/user_stories_test.rb