Merge branch 'master' of https://github.com/chairuosen/FlappyBird-By-JS

Conflicts:
	README.md