NOT A COMMENT IGNORE THIS
Merge branch 'master' of https://github.com/kgourgou/NumAlgo-Project

Conflicts:
	serial_version/matFunctions.h