Add activerecord tables and update app.rb db model
Merge branch 'master' of https://github.com/RandyDavis/MealMe
Update app.rb to get past merge conflict