Orders_Controller
API wrapper progress, rspec progress
added users controller and view, got sha2-password saving to work
Merge pull request #8 from msmith7904/matthew_branch

API wrapper progress, rspec progress
Merge branch 'users_model_controllers'

Conflicts:
	burger_button_app/Gemfile
	burger_button_app/Gemfile.lock
Merge pull request #10 from msmith7904/sheri_order_branch

Orders_Controller
Merge remote-tracking branch 'origin/orders'

Conflicts:
	burger_button_app/log/development.log
Merge branch 'master' of github.com:msmith7904/burger_button
fixed gemfile.lock
added root to routes