Merge test.
Merge branch 'master' of github.com:JordanBlocher/openmpi

Conflicts:
	nbody/src/nbody.cpp