Merge branch 'thomas' of github.com:clejeu03/TowerDefense
Merge branch 'master' of github.com:clejeu03/TowerDefense
Merge branch 'master' of github.com:clejeu03/TowerDefense
Solving merging issues
View comments end !
Created the Base class
Base ready to be use by the ArmyManager
Setting the launch of units
View -  BaseSprite clicked management (beginning)
Adding a parameters panel to create a new game (beginning)
Merge branch 'aurelie'
Merge branch 'thomas'

Conflicts:
	src/GameEngine/MapManager.java
View - choose your starter, the number of player and your ennemies
Merge branch 'aurelie'
Merge bugs fixed
Bases initialisation
New map +  View : displaying the bases initialized by the engine (test)
Loading MapManager from tmp file for faster rendering