delivery part 3
Merge branch 'master' of https://github.com/Draegert/WebIntelligence-MiniProject-Part2

Conflicts:
    Delivery/Report.pdf