Fixed form, trying to change DB
Merge branch 'master' of https://github.com/dgrant069/Grubly into nick
Fixed critical error on menus
Added appropriate logic for order views
FINALLY created viewable past orders for users
Cleaned up past_orders resource to remove unnecessary things
Saving progress until now
Checking in
pulled nicks branch, making me commit for some reason
Checking in forward progress
Checking in at 2:30
resolved merge conflicts'
caught another merge conflict
caught another merge conflict
updated some controllers and view
new orders can save
fixed order fixtures to have relations to restaurants
completed spec for new order (happy path)
changed before filter around (ignoring new and create for now)
Merge pull request #1 from ivanoats/nick

new orders can save
updated tests. Order update action updated, but isn't getting all params
CUD tests are passing. Show routes right but isn't showing order properly