fix up
Merge branch 'master' of https://github.com/kicco73/SmartLiving
Merge branch 'master' of https://github.com/kicco73/SmartLiving
Merge branch 'master' of https://github.com/kicco73/SmartLiving
Merge branch 'master' of https://github.com/kicco73/SmartLiving
Merge branch 'master' of https://github.com/kicco73/SmartLiving
rd
Merge branch 'master' of https://github.com/kicco73/SmartLiving