added my name (Aaron)
added my name 1 line further down
Merge pull request #1 from infinityfarm/master

added my name 1 line further down
Alex's changes to readme.md
Sheri's initial commit
Revert "added my name 1 line further down"
Merge pull request #2 from msmith7904/revert-1-master

Revert "added my name 1 line further down"
Merge branch 'master' into alex_work

Conflicts:
	readme.md
Merge branch 'alex_work'
Merge branch 'master' into sheri_branch

Conflicts:
	readme.md
Merge branch 'sheri_branch'
Initial Codebase Commit
Merge branch 'matthew_branch'
Merge pull request #5 from msmith7904/matthew_branch

Changed migration
Orders_Controller
added users controller and view, got sha2-password saving to work
Merge pull request #8 from msmith7904/matthew_branch

API wrapper progress, rspec progress
made views folders and a few files for orders and home
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