Edited code to fix error messages
Merge branch 'mergesort' of https://github.com/tassiahmed/Sia into mergesort

Conflicts:
	src/common/erasure/erasure.c