contabilidad y weather
Merge branch 'master' of https://github.com/jpvaldesg/Quesos-Hualpen-app

"merging conflicts"