meh
Merge branch 'master' of https://github.com/Honason/Dice

Conflicts:
	GameEngine.java
	GameTurn.java