Added basic colision. Needs improvements.
Merge pull request #7 from Daniferrito/master

Adding colision system