nbody updated
Merge branch 'master' of git@github.com:loostrum/python

Conflicts:

	cosmo/nbody.py
Merge branch 'master' of git@github.com:loostrum/python
normalised results