pulling
Merge branch 'dev' of github.com:maneeshnycda/foodly
item controller/views filled
Merge branch 'dev' of github.com:maneeshnycda/foodly into dev

Merging from Franky.
Merge branch 'master' into dev

Merging from master into dev.
updated restaurant id
fixing show page
merging
prepping for new table EVIL quantity
added orderitems model and controller
fixed orders FINALLY EVIL QTYgit add -A!
login form errors
fixed errors and added some div elements for the order page
preping polymorphic association
Merge branch 'dev' of github.com:maneeshnycda/foodly into dev
review form loading
fixing up views and order submission
reviews routing to comments create
review form working restaurants
merging with franky