remove infoWindow.close()
remove commented lines of code
fix merge conflicts
Merge pull request #23 from tiger-swallowtails-2013/fixin_google_maps

Fixin google maps