google map javascript
resolved conflicts
Merge pull request #33 from kneekey23/nicole

Nicole