secondary storage structure
Merge branch 'master' of https://github.com/bhauck/os12-13

Conflicts:
	os.tex