weather stuff
weather
hi
Merge branch 'ryan'

erged changes to weather
merging weather