testing merges with test.py
Merge branch 'Dev' of https://github.com/bretter/LightingSystem into Dev

Conflicts:
	test.py