modified gitignore
commit new gitignore
mauvais commit
Revert "mauvais commit"

This reverts commit 48909d156c0af3a607f14dd7eec343ec6ee19b67.
commit new gitignore
modif message
autre modif message
rajout sysout
resolved conflicts
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestProject/.gitignore