googlemaps feature
test added to fix branch
3 way merge example
Merge branch 'fix'
fix.html
indexway
fix.html
Merge branch 'fixerror'
index.html
index on master
fixed
index.html
rebase