remove database username/pw
resolve merge conflict
generate dish model/migration
add dish routes
layout basic model tests
add factorygirl to gemfile and factories directory
setup dish factory
implemented basic dish model tests
Merge pull request #3 from eugenefilimonov/menu_views

Menu views