Fixed conflicts
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/cs2114/ninjaassassin/entity/dynamic/Enemy.class
	src/cs2114/ninjaassassin/entity/dynamic/Enemy.java
Merge branch 'master' of https://github.com/IronCrystal/NinjaAssassin

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