Allowed for inheritance checks
Updated the readme
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/sourcecoded/events/EventBus.java