stash
Merge branch 'master' of https://github.com/olavemil/PIC

Conflicts:
	Report/background.aux
	Report/background.tex
	Report/report.pdf
	Report/report.synctex.gz
	Report/report.toc
working from laptop
laptop update