People lines
Merge branch 'master' of github.com:medea-project/medea-sprint