from svn
Merge branch 'master' of https://github.com/JimBuffenbarger/TemperatureLogger