Added collision detection with obstacles

You get stuck in them now though