Vinna i Travis
uppfaersla
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/outputFileStates.bin
	.gradle/2.1/taskArtifacts/taskArtifacts.bin
	.travis.yml
	build/classes/main/is/fantastic7/tictactoe/TicTacToeWeb$2.class
	build/classes/main/is/fantastic7/tictactoe/TicTacToeWeb.class
	build/jacoco/classpathdumps/com/sun/proxy/$Proxy2.class
	build/jacoco/classpathdumps/com/sun/proxy/$Proxy3.class
	build/jacoco/jacocoTest.exec
	build/jacoco/run.exec
	build/reports/tests/classes/is.fantastic7.tictactoe.TicTacToeTest.html
	build/reports/tests/index.html
	build/reports/tests/packages/is.fantastic7.tictactoe.html
	build/test-results/TEST-is.fantastic7.tictactoe.TicTacToeTest.xml
	build/test-results/binary/test/results.bin
	build/tmp/expandedArchives/org.jacoco.agent-0.7.1.201405082137.jar_5b71ej10acm3snspj0i3lllh41/META-INF/MANIFEST.MF
	build/tmp/expandedArchives/org.jacoco.agent-0.7.1.201405082137.jar_5b71ej10acm3snspj0i3lllh41/META-INF/MTNMINDS.RSA
	build/tmp/expandedArchives/org.jacoco.agent-0.7.1.201405082137.jar_5b71ej10acm3snspj0i3lllh41/META-INF/MTNMINDS.SF
	build/tmp/expandedArchives/org.jacoco.agent-0.7.1.201405082137.jar_5b71ej10acm3snspj0i3lllh41/META-INF/maven/org.jacoco/org.jacoco.agent/pom.properties
	build/tmp/expandedArchives/org.jacoco.agent-0.7.1.201405082137.jar_5b71ej10acm3snspj0i3lllh41/META-INF/maven/org.jacoco/org.jacoco.agent/pom.xml
	build/tmp/expandedArchives/org.jacoco.agent-0.7.1.201405082137.jar_5b71ej10acm3snspj0i3lllh41/about.html
	build/tmp/expandedArchives/org.jacoco.agent-0.7.1.201405082137.jar_5b71ej10acm3snspj0i3lllh41/jacocoagent.jar
	build/tmp/expandedArchives/org.jacoco.agent-0.7.1.201405082137.jar_5b71ej10acm3snspj0i3lllh41/org/jacoco/agent/AgentJar.class