micro maj
Merge branch 'master' of https://github.com/Moi4167/projet_harmonie

Conflicts:
	src_prototype/main/Regle.java