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
Created the Base class
Base ready to be use by the ArmyManager
Setting the launch of units
Merge branch 'aurelie'
View - choose your starter, the number of player and your ennemies