merged with master
added my location to map, zooms to my location on load