Updated a lot of stuff, not everything works, still compile errors
Merge branch 'master' of https://github.com/tiboke1992/groep22 into HEAD