added map and markers
:Merge branch 'master' of github.com:aaronkai/farmers_market

Conflicts:
	app/views/markets/index.erb
Merge branch 'master' of github.com:aaronkai/farmers_market