Chapter 13 Finished
Merge branch 'master' of https://github.com/hilliard/depot

Conflicts:
	app/controllers/admin_controller.rb
	app/controllers/sessions_controller.rb
	app/controllers/users_controller.rb
	app/mailers/notifier.rb
	app/models/user.rb
	app/views/admin/index.html.erb
	app/views/notifier/order_received.text.erb
	app/views/sessions/new.html.erb
	app/views/users/_form.html.erb
	app/views/users/index.html.erb
	config/routes.rb
	db/schema.rb
	test/fixtures/users.yml
	test/functional/notifier_test.rb
	test/functional/sessions_controller_test.rb
	test/functional/users_controller_test.rb
	test/integration/user_stories_test.rb