modifs 2
Merge branch 'master' of https://github.com/miiicmueller/SmartWater.git
tests
Merge branch 'master' of https://github.com/miiicmueller/SmartWater.git