Big doom update
Merge branch 'master' of https://github.com/SpoinkyNL/Groep2Game.git