Merge pull request #54 from loganwatanabe/master

Basic Google maps
merged upstream