updated main.js to add infowindow to the markers.
Merge branch 'master' of https://github.com/hagino3000/Imperial-Marathon-Map

Conflicts:
	app/scripts/main.js