re re conflit (test)
Merge branch 'master' of github.com:imie-source/CDI-N-09_G2

Conflicts:
	testProject/src/HelloWorld.java