map now goes off users location
Merge remote-tracking branch 'origin'