gradle
Merge branch 'master' of github.com:Fantastico7/TicTacToe

Conflicts:
	.gradle/2.1/taskArtifacts/cache.properties.lock
	.gradle/2.1/taskArtifacts/fileHashes.bin
	.gradle/2.1/taskArtifacts/fileSnapshots.bin
	.gradle/2.1/taskArtifacts/taskArtifacts.bin
	build/classes/main/is/fantastic7/tictactoe/TicTacToe.class
	build/jacoco/run.exec