setting
Merge branch 'master' of https://github.com/rightweather/weather

shauna