Merge pull request #5 from msh345/google_maps

Google maps
Merge branch 'master' into google_maps