Assignment 5.1
Merge branch 'master' of heroku.com:peaceful-hollows-7955

Conflicts:
	app/controllers/orders_controller.rb
	config/routes.rb