new restaurant user form with image upload, photo upload for slideshow as separate form on separate page
ability to upload image into photo model from form restaurant new, all in one go, not able to upload multiple photos, only one
Merge branch 'master' of github.com:MarissaMac/dinefy

Conflicts:
	Gemfile
	app/assets/javascripts/application.js
	app/controllers/restaurants_controller.rb