Make consistancy
Merge branch 'master' of https://github.com/Weil0ng/cs270

Conflicts:
	DiskEmulator.c
	Makefile

merge conflict
Resolve Conflict
Merge branch 'master' into layer2