First Draft
Event updates.
Merge branch 'freddy-master'

Conflicts:
	presentation.html