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

Conflicts:
	SpiderGUI.py