Changed equals() to isCloseTo() in the AI
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/cs2114/ninjaassassin/entity/dynamic/Enemy.class
Fighting with github