My Events
Merge branch 'master' of https://github.com/susudev/susu

Conflicts:
	www/events.html