update wisps
update for wisps
Merge branch 'master' of https://github.com/cgarvey/ioffl-combinedmap

Conflicts:
	index.html
.