fout
asdMerge branch 'master' of https://github.com/Kminkjan/datastructuur

Conflicts:
	src/datastructuur/RSHeap.java