I believe the event i added is aligned now
Merge branch 'master' of https://github.com/tatalala/Thirsty

Conflicts:
	events.html
Merge branch 'master' of https://github.com/tatalala/Thirsty