Merge branch 'lecturer'
Merge branch 'master' into lecturer
Merge branch 'lecturer' of https://github.com/lilla93/PASS into lecturer