Merge pull request #1 from jolleon/collision_detection

basic map
basic map functionality