ledStrip2.18
Merge branch 'master' of github.com:brearto2/ledWebServer

Conflicts:
	ledStrip/v2/ledStrip.py