starting nested model form
progressing with nested forms
database fixed for image_container
Javascript coffee for removal added
continued work on implementing nested form
further work on nested forms
more work on nested model form
merge conflict Schema
Merge branch 'master' of https://github.com/StephanMusgrave/ProjectX
Merge branch 'image_container' of https://github.com/StephanMusgrave/ProjectX

Conflicts:
	app/controllers/listings_controller.rb
	app/views/layouts/application.html.erb
	app/views/listings/_form.html.erb
	app/views/listings/show.html.erb
	config/routes.rb
	db/schema.rb
Image container fix
Merge branch 'master' of github.com:StephanMusgrave/ProjectX into chatroom
created feature file for ending negotiations between a buyer and a seller. pulled from master branch that has multiple image upload capability completed