added cancan
Merge branch 'will' of https://github.com/dlashrus/QuiKitchen into andrew

Conflicts:
	Gemfile
	db/schema.rb
working on dishes views
pulling wills shit

erge branch 'will' of https://github.com/dlashrus/QuiKitchen

d;flkja;lskdfja
iwepr
added can can make sure to run bundle install and rake db:migrate
working on views
Merge branch 'david' of https://github.com/dlashrus/QuiKitchen into andrew
added view/controller for meals
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
Ingredients controller & basic views added