Merge branch 'master' of github.com:Gi11i4m/Scrumbags into Design
Design changes
Merge conflicten opgelost