Gamelogic
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	src/3D2048.v11.suo