Merge branch 'master' of C:\School\git\groepH\groepHFinal\finalfinal\groepH with conflicts.
Merge remote-tracking branch 'origin/master'
Final version