Added join table for menu items and orders
Merge conflicts
Merge pull request #12 from deedeelavinder/master

added fields to user model, created registrations controller, edited views to match
handled conflict
handled conflicts
Merge pull request #13 from kheang/master

Added join table for menu items and orders
brought back user tests, but commented them out until we better understand Devise
created account model with basic tests
merged conflicts
edited user test
Added unit tests to order model
fixed migration
Merge pull request #15 from kheang/master

Added units tests for order model
merged conflicts
conflicts merged
Merge pull request #14 from nickpassarella/master

Added account model and brought back user tests (commented out for now)
removed menu items orders join table migration
Merge branch 'upstream_merge'
didn't really do anything
added school id to availability