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

Conflicts:
	part2/factorization.o
	part2/part2
	part2/part2.o