jumping, guess it's working
Merge branch 'master' of github.com:donequis/darilth

Conflicts:
	src/main/java/aryth/model/Circle.java
	src/main/java/aryth/state/ingame/InGame.java
better goku feel