Corrected new merged-in files.
Merge branch 'master' of https://github.com/PotcFdk/TemPIC3000
Merge branch 'master' of https://github.com/PotcFdk/TemPIC3000