ça c'est du commit !
Merge branch 'master' of github.com:sberry42/imieIndus

Conflicts:
	.gitignore
Ajout de TennisTest
Merge branch 'master' of github.com:sberry42/imieIndus