map collisions now work
delete commented out lines to fix merge conflict
Merge pull request #76 from dabeeya/master

map collisions work with tile map editor