working
Merge branch 'master' of https://github.com/grandpad/tictactoe

Conflicts:
	.gitignore