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

Conflicts:
	shmup/dist/js/game.js
	shmup/game/states/play.js