Merge branch 'master' of https://github.com/Opstrup/android_project

Conflicts:
	bin/AndroidManifest.xml
	bin/R.txt
	bin/TicTacToe.apk
	bin/classes.dex
	bin/classes/com/example/tictactoe/R$drawable.class
	bin/classes/com/example/tictactoe/R$id.class
	bin/classes/com/example/tictactoe/R$integer.class
	bin/classes/com/example/tictactoe/R$layout.class
	bin/classes/com/example/tictactoe/R$menu.class
	bin/classes/com/example/tictactoe/R$string.class
	bin/classes/com/example/tictactoe/R$style.class
	bin/classes/com/example/tictactoe/R$styleable.class
	bin/classes/com/example/tictactoe/SinglePlayerGameActivity.class
	bin/resources.ap_