no message
Merge branch 'master' of https://github.com/DreaX/Housenky

Conflicts:
	latex/lab1Report.tex
no message