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

Conflicts:
	test/fr/miage/atlantis/board/GameBoardTest.java