trying to mergeee
Merge branch 'master' of https://github.com/sperez8/HivePlotter.git

Conflicts:
	scripts/hive.py