Events det
Merge branch 'master' of https://github.com/skittle/TeamUp.git

Conflicts:
	Events app/event.html