Q7, 2/4
Merge branch 'master' of https://github.com/NickyL/INFOB2KI-B