support bullet collision with heros
Merge branch 'master' of github.com:fusijie/LudumDare31

Conflicts:
	src/hero.js
Merge pull request #5 from calfjohn/master

2 commits