Merge branch 'master' into sophie
Mergesort gefixt (dankzij Antoine)
Merge branch 'sophie' of https://github.com/Kurocon/softwaresystemen into sophie
MergeSort gefixt
Freaking merge conflits