removed an unnecessary form
made changes in popups controller, added id to index method
changed js stuff, deleted comment form
resolving conflict
bracket problem solved
prep for group pull
Merge branch 'master' of https://github.com/mathur7/Project-2

Conflicts:
	app/controllers/popups_controller.rb
	log/development.log
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/8d0c1165a411680e9e9450a501dbe3bb
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/e6823a854977fc043413b3421c210f93
	tmp/cache/assets/development/sprockets/f47618b1849b78890127bbfcd848d644
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
post ajax creation working