Nyan Race Progress
Merge branch 'master' of https://github.com/lcb931023/mini_trooper

Conflicts:
	game/js/main.js