Initial map
Centered the map on the users current location
Merge branch 'map'