Next stage of Disk Space

I think I'm almost done with this. Have yet to test it though. Where
exactly will it write this file? Will it be able to find it once it is
written?
Merge branch 'master' of https://github.com/dthiemann/OOSD_project_part2

Conflicts:
	OOSD_project_part2/src/org/uiowa/cs2820/engine/DiskSpace.java