commit all
Merge branch 'master' of https://github.com/pimpin/gestion_projet

Conflicts:
	tests/units/HelloWorld.php
commit all
commit all
commit all
commit
commit
add nbproject
aaa
Merge branch 'master' of https://github.com/nadhub/gestion_projet

Conflicts:
	classes/helloWorld.php
	tests/units/HelloWorld.php