angular google maps working, geolocation refreshing every 30 secs
merge conflict resolved
Merge pull request #3 from kelseyledford/gmaps

Gmaps