nouveu chg
Merge origin/master

Conflicts:
	ProjetGitTest/src/NewClass.java