non working commit
Merge branch 'master' of https://github.com/duneplanet/mpi

Conflicts:
	algo1_note.c
	vertices.h