Some physics?
Merge branch 'master' into thenriod

Conflicts:
	nbody/src/nbody.cpp