Zoom function implemented, you can't move/zoom out of bounds on map
conflict resolved
conflict resolved