smf and csfr
Merge branch 'master' of github.com:salomanders/NbodyPythonTools