debug for file system bug.
Fix ! Merge branch 'master' of github.com:CHometeach/hw2

Conflicts:
	test1