Gradle tasks
Gradle tasks --all
commiting a merge

Merge branch 'master' of github.com:HUGB-SilverBullet/TicTacToe

Conflicts:
	.gradle/2.1/taskArtifacts/cache.properties.lock
	.gradle/2.1/taskArtifacts/fileSnapshots.bin
	.gradle/2.1/taskArtifacts/taskArtifacts.bin