added google map api
fixed merge conflict
setup google maps api after merge
Merge pull request #2 from jahoopes/master

Added google maps api