combine screen
Merge branch 'master' of https://github.com/ECE1780PROJECT/home-control-prototype