added collision detection. Working on vinil map.
Merge branch 'master' of https://github.com/onatbas/the-temple