modified:   index.html
Merge branch 'master' of https://github.com/wirelesspt/meshmap

Conflicts:
	index.html

	deleted:    index.html
	new file:   index.html