.
Merge branch 'master' of https://github.com/bale11/hpc_assignment

Conflicts:
	part2/results_test.dat