uploading latest
Merge branch 'master' of https://github.com/sdfinney/SolarFlyInput_clean

Conflicts:

bin/SolarFlyInput_cleanDebug.app/Contents/MacOS/SolarFlyInput_cleanDebug