toujours le test
Merge branch 'master' of https://github.com/PixelSenseEnib/PixelSense

Conflicts:
	testGit/test.txt