formatting
Merge branch 'master' of https://github.com/MGM-KTH/pipe

Conflicts:
	report/lab1.tex