Update xcode project with recent file changes
Merge remote-tracking branch 'upstream/master'
started work to make the speed slider slow down the flame speed.
Restore hlsIdata import... not sure why this keeps getting removed.
updated readme for 3.1.4
Merge branch 'master' of https://github.com/smeighan/xLights
On OSX, set a bitmap for the button so the color is visible
Merge remote-tracking branch 'upstream/master'