clean-up
polished up markers
Merge branch 'master' of github.com:wahl77/WDI_FinalProject
Merge branch 'fix_markers'
cleaning
fixed zoom button and added watercolor tiles and css styling to the map
fixed bug
refreshed seed file
Merge branch 'master' into seed

Conflicts:
	app/assets/javascripts/map.js