Change User Weather Description
Fix merge conflicts
Merge pull request #43 from brandonjyuhas/weather_codes

Weather codes