pushed bug fix for DirEntry
remove tmp files
Merge branch 'layer2' of https://github.com/Weil0ng/cs270 into layer2

Conflicts:
	Directories.c

Resolve conflict