ignore
Merge branch 'develop' of https://github.com/GeforceLee/2048 into develop

Conflicts:
	.gitignore