duncan's file saved
Merge branch 'master' of https://github.com/OpenSourcePortland/weather_weasel_prototype
merging files