Chris Witty caught an error
finish weather
Merge branch 'master' of https://github.com/CSCI-4830-002-2014/challenge-week-12