users controller, orders controller, API methods modified
Merge branch 'new_branch_sunday' of github.com:msmith7904/burger_button

Conflicts:
	app/controllers/users_controller.rb