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
users can choose location
fixed bug
refreshed seed file
Merge remote-tracking branch 'origin'

Conflicts:
	app/assets/javascripts/images.js
	app/assets/javascripts/map.js
	app/views/images/new.html.erb
	config/routes.rb
Merge branch 'master' into seed

Conflicts:
	app/assets/javascripts/map.js
changed homepage color scheme
fixing location marker display
working on homepage and added file shipred
fixed location marker
Merge branch 'location_marker'
Still need to try it but this should work for Amazon storage
Adding font
Merge branch 'master' into front_page_photo_and_font_styling
backgound image