added andrews changes, working on dishes views
trying to merge andrews into mine, Please enter a commit message to explain why this merge is necessary,
basic dishes views done
adjusted application controller to allow for :role in devise
Merge branch 'david' of https://github.com/dlashrus/QuiKitchen into andrew