update
Merge branch 'master' of https://github.com/nguoianphu/nguoianphu.github.com

Conflicts:
	flapp1/dist/js/game.js