add dishes controller
layout dishes controller specs
resolve merge conflicts
add restaurant factory
add migration for restaurant_id column
add restaurant id column to dish table
continue dish controller specs
resolve conflict in restaurant model
add url column to dishes
add dish routes
add dish controller index, show, new spec tests
implement dish controller index, show, new, create actions
add edit / update routes
more dish routes
finish dishes controller specs
finish basic dish CRUD controller actions
add blank dish edit page
rearrange dish routes and controller for consistency between controllers
Merge branch 'master' into menu_views

* master:
  migration fix
  travis build
  trying to start travis
  all tests passing for all
  integration tests done for editing
  all test for all controller and features pass
  passing controller tests for deactivating a user
  feature and controller tets passing for sessions
  created login/logout with tests
  passing tests for create user
  writing test for creating user
  mergin to change branches
  testing travis
remove plpgsql