Merge branch 'master' of https://github.com/kakamble13052/SmartHousing