add clear map marker button
add clear map button
Removed extraneous console.log
Merge branch 'master' of https://github.com/chyld/civic-hacking

necessary
Added marker icons
Updated marker icons again
consolidate all api calls into one
Merge branch 'master' of https://github.com/chyld/civic-hacking
remove old files
remove user marker from clearMarkers function
Marker Info Displays on Click
Merge branch 'master' of https://github.com/chyld/civic-hacking

Conflicts:
	app/static/js/es6/maps.es6.js
waypoints
Merge branch 'master' of https://github.com/chyld/civic-hacking
merge fixes
fix trip title
Larger marker icons
Merge branch 'master' of https://github.com/chyld/civic-hacking
Icons sized right for Goldilocks
minified everything