Merge pull request #20 from badnack/development

Development
Merge pull request #21 from badnack/development

added destroy dependency
Merge pull request #22 from badnack/development

Development
Design stuff, and implementation of photo-uploader from computer
Merge pull request #23 from badnack/development

Development
Merge remote-tracking branch 'upstream/development' into development

Conflicts:
	app/views/dinners/index.html.erb
	db/schema.rb
Removed photo