move and collide
Merge pull request #51 from rainsharmin/master

final update