Set default location of the map based on user's current location
Merge branch 'john'

Merging my changes with Kenny's
Merge pull request #20 from jahoopes/master

merging my changes with kenny's