gradl conf
Merge branch 'master' of github.com:sberry42/imieIndus

Conflicts:
	Tennis/.gradle/2.0/taskArtifacts/cache.properties.lock
	Tennis/.gradle/2.0/taskArtifacts/fileHashes.bin
	Tennis/.gradle/2.0/taskArtifacts/fileSnapshots.bin
	Tennis/.gradle/2.0/taskArtifacts/outputFileStates.bin
	Tennis/.gradle/2.0/taskArtifacts/taskArtifacts.bin
	Tennis/build.gradle
modif gitignore!