added url field to restaurants
add dishes controller
testing ctrl. pushing for Dish
Merge pull request #3 from eugenefilimonov/menu_views

Menu views
layout dishes controller specs
resolve conflicts in routes
commit for schema change before pull
Merge branch 'master' of https://github.com/eugenefilimonov/final_project
resolve merge conflicts
add restaurant factory
add migration for restaurant_id column
controller tests pass
positive rest ctrl tests pass
fixed failing test on validation
Merge pull request #6 from eugenefilimonov/rest_tests

Rest tests
add restaurant id column to dish table
continue dish controller specs
resolve conflict in restaurant model
add url column to dishes
add dish routes