Animation
SimpleCollision Template
Merge branch 'origin/master'

Conflicts:
	src/game/AnimationTest.java