init
update
Merge branch 'master' of git@github.com:41zone/fx2048.git

Conflicts:
	.gitignore