Breytingar á main
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/outputFileStates.bin
	.gradle/2.1/taskArtifacts/taskArtifacts.bin
	src/main/java/is/ru/tictactoe/TicTacToeMain.java
	src/test/java/is/ru/tictactoe/TicTacToeTest.java