returns original seed file
Fixes asset host for production environment
fixes image url naming for items partial
removes image tag to work with heroku
Comments out incomplete Mailer
Comments out line 19 in orders controller
Fixes redirect for inactive and unpublished restaurants
Fixes Heroku issues for pivotal tracker stories.

deviled eggs image test

returns original seed file

Fixes asset host for production environment

fixes image url naming for items partial

removes image tag to work with heroku

Comments out incomplete Mailer

Comments out line 19 in orders controller

Fixes redirect for inactive and unpublished restaurants
Adds admin access to unpublished restaurant
Merge branch 'master' of github.com:wvmitchell/fourth_meal

Conflicts:
	app/controllers/restaurants_controller.rb
Fixes user and owner permissions for viewing a restaurant
Adds redirect if user attempts to go to a restaurant that does not exist
Redirect new user from unpublished restaurant page
Add restaurant dashboard route back in
Redirects to intended destination on login and failed login
All tests passing
Fixed conflicts
Merge pull request #33 from wvmitchell/creating_resturants

All tests passing
Added new route to items
Create restaurant link no longer appears if user is a restaurant owner