check in RenderFaces.cpp
Merge branch 'master' of https://github.com/smeighan/xLights

Conflicts:
	xLights/xLightsMain.cpp