fea
Merge branch 'master' of https://github.com/BjornBjarnsteins/SpiderMaster-3000

Conflicts:
	SpiderGUI.py