initial commit
Merge branch 'master' of github.com:henryzx/2048GameAndroid

Conflicts:
	.gitignore