Add MAX_FILE_SIZE
before merge
Merge branch 'layer2' of https://github.com/Weil0ng/cs270 into layer2

merge
resolve conflict
Merge branch 'layer2' of https://github.com/Weil0ng/cs270 into layer2

Conflicts:
	Directories.h

resolve conflict