fixing merge
Merge branch 'master' of https://github.com/sperez8/HivePlotter.git

Conflicts:
	tmp/edgeshive1.js
	tmp/hive1.html
	tmp/nodeshive1.js