Suppression des coordonnées.
gitignore
delete build
??
Récupération des actions dispo pour batiments et unités en cours...
Random Commit
Actions boutons done + debut graphismes
Suppresion des buils dans les commits
Merge branch 'master' of https://github.com/N1colasDucom/CivilizationJava

Conflicts:
	.gitignore
	Graphics/Tileset/gameMap.png
	Graphics/Tileset/map.tmx
	build/classes/civilization/game_engine/Game.class
	build/classes/civilization/game_engine/Play.class
	build/classes/civilization_batiments/Aeroport.class
	build/classes/civilization_batiments/HotelDeVille.class
	build/classes/civilization_batiments/Maison.class
	build/classes/civilization_batiments/Port.class
	build/classes/civilization_unites/UCM_BateaudePeche.class
	build/classes/civilization_unites/UCT_Paysan.class
	build/classes/civilization_unites/Unite.class
	build/classes/civilization_unites/UniteCivile.class
	nbproject/private/private.properties
	nbproject/private/private.xml
	src/civilization_unites/UCM_BateaudeCroisiere.java
	src/civilization_unites/UCM_BateaudePeche.java
	src/civilization_unites/UCT_Paysan.java
	src/civilization_unites/UMM_Destroyer.java
	src/civilization_unites/Unite.java
	test2.txt
Merge branch 'actions-boutons'

Conflicts:
	.gitignore
	Graphics/Tileset/map.tmx
	nbproject/private/private.properties
	src/civilization/Civilization.java
	src/civilization/game_engine/Play.java
	src/civilization_batiments/Aeroport.java
	src/civilization_batiments/Batiment.java
	src/civilization_batiments/Caserne.java
	src/civilization_batiments/Mine.java
	src/civilization_batiments/Mur.java
	src/civilization_batiments/Port.java
	src/civilization_batiments/Scierie.java
	src/civilization_batiments/Tour.java
	src/civilization_unites/UCM_BateaudeCroisiere.java
	src/civilization_unites/UCM_BateaudePeche.java
	src/civilization_unites/UCT_Ouvrier.java
	src/civilization_unites/UCT_Paysan.java
	src/civilization_unites/UMM_Destroyer.java
	src/civilization_unites/UMT_BombeNucleaire.java
	src/civilization_unites/UniteCivileAerien.java
	src/civilization_unites/UniteCivileMaritime.java
	src/civilization_unites/UniteCivileTerrestre.java
	src/civilization_unites/UniteMilitaire.java
	test2.txt