Generate markers based on location hash functional with only one bug
Merge branch 'markerGen'

Conflicts:
	app/assets/javascripts/script.js