updated css to show black events box
Merge branch 'master' into HEAD

Conflicts:
	assets/css/style.css
Merge branch 'master' of https://github.com/kevin-roark/adhoc-x2
better clean body