Merge pull request #9 from calfjohn/master

fixed a bug
add star.
Merge branch 'master' of github.com:fusijie/LudumDare31
replace bubble res.
Merge branch 'master' of github.com:fusijie/LudumDare31

Conflicts:
	src/bulletController.js
	src/itemController.js
	src/resource.js