mise en page
Merge branch 'master' of https://github.com/Valball/harmonie_l2.git

Conflicts:
	Harmonie/src/source/Note.java
test
Merge branch 'master' of https://github.com/Valball/harmonie_l2.git
test
Merge branch 'master' of https://github.com/Valball/harmonie_l2.git

Conflicts:
	Harmonie/src/source/Note.java