fixed some things
Merge branch 'master' of github.com:Altarisdrengirnir/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