Merge remote-tracking branch 'origin/gameLogic' into junit
gameBoardTest : update due to recent UML Change
Nothing but need to checkout another branch
Merge branch 'graphics' into junit

Conflicts:
	nbproject/private/private.properties
	src/fr/miage/atlantis/entities/Shark.java
tree: Remove files that shouldn't be tracked

Merging is going to be fun
Test automated generation
created test atlantis.logic
Merge branch 'junit' of github.com:xplodwild/Atlantis into junit
Revert "created test atlantis.logic"

This reverts commit 2b3349d6f60555daaddb6c613cd920d72246077f.
created Atlantis logic test
Old tests deleted
GameBoardTest: Add test testIsTileAtWaterEdge()
GameTileTest : added Test testAddEntity()
Merge branch 'junit' of github.com:xplodwild/Atlantis into junit
GameBoardTest: test added testGetTileSet, bugfix in randomize.
Merge branch 'junit' of github.com:xplodwild/Atlantis into junit
GameTileTest : added test testRemoveEntity()
GameBoardTest: Test added testGetFirstTile
Merge branch 'junit' of github.com:xplodwild/Atlantis into junit
GameTileTest : added test testRemoveFromBoard