Merge pull request #5 from yousbj/master

Submission 2
Submission after handling collisions