added friction force need to merge
Merge branch 'master' of https://github.com/abag/NuVort
merged diagnostic