+
Merge branch 'master' of https://github.com/Jaykhum/dicewar.git

Conflicts:
	dicewars/src/main/scala/controller/DicewarController.scala