bud fix
Merge branch 'master' of https://github.com/jueyuansanqv/COMP231_iHome