documentation
Merge branch 'master' of https://github.com/Philipp-M/ACG.git