scout progress
Merge branch 'master' of https://github.com/ahoegger/educationDi.git