Feature work
Merge pull request #7 from githubteacher/fix-for-temperature

Feature work
Merge remote-tracking branch 'origin/master' into eddiesbranch