IO definitief
ugh
Merge branch 'master' of https://github.com/Jfeurich/Ass2

Conflicts:
	src/logic/Disk.java