random other stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	events.php
	main.css