potentially fixed error on some number of threads
Merge branch 'master' of github.com:em-mo/TDDD56

Conflicts:
	lab3/sort.c