google map javascript
Merge pull request #32 from kneekey23/meltastic

Meltastic
resolved conflicts
Merge pull request #33 from kneekey23/nicole

Nicole
checking stuff in
Merge branch 'master' into meltastic
checked in stuff