trying to merge
Merge branch 'master' into dev
added Gemfile for heroku
some stuff
Delete Gemfile.lock

deleted for local, add back for heroku.
removed gemfile.lock again
Merge branch 'master' of github.com:maneeshnycda/foodly

Why this merge?  after deleting Gemfile.lock
added some styles and header formatting
adding styles and menu options for admin
Merge branch 'dev' of github.com:maneeshnycda/foodly into dev

Merging from Franky.
Merge branch 'master' into dev

Merging from master into dev.
fixing show page
merging
prepping for new table EVIL quantity