"More user_order tweaks"
Merge branch 'rspec_testingII' of github.com:msmith7904/burger_button

Conflicts:
	app/controllers/orders_controller.rb
	lib/orderin.rb
Merge branch 'master' of github.com:msmith7904/burger_button