retrieve ruby get_marker_data in javascript
Merge branch 'datatojs' of github.com:cherimarie/beerdar into markerGen
Location data passable between index and js
Merge branch 'markerGen'

Conflicts:
	app/assets/javascripts/script.js
	app/views/map/index.html.erb
	db/development.sqlite3