first
renamed
ntr
did i forget to commit this?
Merge branch 'master' of github.com:sosi-org/phdch5