GameTurnTest
Merge branch 'junit' of github.com:xplodwild/Atlantis into junit

Conflicts:
	test/fr/miage/atlantis/logic/GameTurnTest.java
GameTurnTest : testOnDiceRollFinished()