...
Merge branch 'master' of github.com:j08lue/hpcompassignment

Conflicts:
	report/part_conclusion.tex
	report/part_experiments.tex
	report/part_intro.tex