Merge pull request #83 from jsmit032/weather-main

Rename variables.
Set up logic so no duplicate items in day or night.