Merge pull request #45 from winstonho/master

update
Merge pull request #46 from winstonho/master

basic Collision
Merge pull request #47 from winstonho/master

jumping Collision Done
update
Merge pull request #18 from huanzhz/master

m2