event sub cat

event sub cat
Merge branch 'master' of https://github.com/skhan18/Bristol

Conflicts:
	.DS_Store