Strt fleshing out these class things here
Fixed any conflicts

Merge branch 'master' of https://github.com/Bro-Pals/TAG_8

Conflicts:
	project_tag8/src/bropals/debug/EventSimulator.java