working with pure css
Merge branch 'master' into working_branch
working on media queries for different screen sizes
model/migration photo
more css stuff
add upload / camera functionality to dish show page
continue to work
Merge pull request #16 from eugenefilimonov/menu_views

Menu views
Merge pull request #17 from eugenefilimonov/model_photo

Model photo
mergin with master
add UserHelper
Merge branch 'master' into working_branch
start dish index view
Merge branch 'master' into menu_views

* master:
  continue to work
  model/migration photo
login integ test and module improvements
continue working on dish index views
resolve conflicts in database.yml
Merge branch 'master' into camera_function

* master:
  login integ test and module improvements
  add UserHelper
  continue to work
  model/migration photo
Merge branch 'master' into menu_views

* master:
  login integ test and module improvements
  add UserHelper
route restaurant links to menu page