deleteAndStripsUndone
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	Planner.html
	index.html
	js/populateAttractions.js
	js/showMap.js
	map.html