in process seed data
Merge pull request #31 from wvmitchell/creating_resturants

Find jobs
Merge branch 'master' of github.com:wvmitchell/fourth_meal into seed_data
in process setting up template seed data
Merge pull request #32 from wvmitchell/seed_data

Seed data
removes pry
Add deviled eggs photo
in process seed images
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
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