Fixing previous missed push
Merge branch 'develop' of github.com:adamclaassen/pyquad into develop

Conflicts:
	Gimbal.py
	Light.py
	Watchdog.py