定下目标
Merge branch 'master' of github.com:funkyLover/canvas-games

Conflicts:
	README.md