First commit
Merge branch 'master' of github.com:zocoi/game-of-me

Conflicts:
	.gitignore