docu
Merge branch 'master' of https://github.com/mbaumBielefeld/PRIMO
First setup.py
Merge branch 'master' into develop
First running setup.py