removed makefile
Merge origin/master

Conflicts:
	MPI/Makefile