Classe Base
Classe Agent (avec bugs) + ajout Base.getId
Merge Thais
Merge Thais 2
Affichage Fenêtre
Update metadata
Merge remote-tracking branch 'origin/Thais'

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/IMACDefense/.indexes/e4/5c/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/IMACDefense/.markers
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1667939141.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
Suppression du metadata
Suppression metadata
Merge Nadia et Master
Suppression metadata
Merge branch 'Fany'
Réorganisation du dossier
Updated gitignore