Merge remote-tracking branch 'origin/Cyril' into commit
test
Merge branch 'commit'

Conflicts:
	src/test/salut.java