resolve conflicts
Merge branch 'master' of github.com:Sykurpudarnir/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/reports/tests/classes/is.ru.tictactoe.TicTacToeTest.html
	build/reports/tests/index.html
	build/reports/tests/packages/is.ru.tictactoe.html
	build/test-results/TEST-is.ru.tictactoe.TicTacToeTest.xml
	build/test-results/binary/test/results.bin