fixes
Merge branch 'master' of https://github.com/adrikei/FinalParalela

Conflicts:
	src/mpi.c
	src/openmp.c