pop up form
Merge branch 'master' of https://github.com/ingridh/railsdecalproj2

Conflicts:
	app/models/event.rb
	log/development.log
i tried