test
Merge branch 'master' of github.com:lakik/MPI_functions_etc

Conflicts:
	test.r