Merge pull request #25 from huanzhz/master

m fireball
fireball collsion done
Merge pull request #56 from winstonho/master

update