resolve conflict
Merge branch 'master' of https://github.com/Brakassey/sun-project.git

Conflicts:
	src/com/brakassey/sunproject/actors/AnimatedActor.java