added Event model
Merge branch 'master' of https://github.com/Enulis/HakunaMatata

Conflicts:
	config/routes.rb