textbf
Merge branch 'master' of github.com:Zucka/SmartHouse

Conflicts:
	report/text/futureWork.tex
Merge branch 'master' of github.com:Zucka/SmartHouse