heee
Merge branch 'master' of https://github.com/Alexcouter/DutOMania.git
CreationBasique
Merge branch 'master' of https://github.com/Alexcouter/DutOMania.git

Conflicts:
	DutOMania/src/jeu/FenetreMain.java