events page
Merge branch 'master' of github.com:m1richey/hack

Conflicts:
	events.html