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

Conflicts:
	GameEngine.java
	GameTurn.java
Revert "meh"

This reverts commit 2f3d1ea01c663ffa9794db3ce8e373839711dad8.
Revert "Revert "meh""

This reverts commit 0352e3bf4d4fab9f07fb2c144e92062f204786b5.