made it be happy
Working on the animation system
Merge remote-tracking branch 'origin/master'

Conflicts:
	Katechon/src/apcs/katechon/engine/collisions/SimpleCollisionEngine.java