../lab/lab10/fsReader
Merge branch 'master' of https://github.com/ccxuy/csi500hw

* 'master' of https://github.com/ccxuy/csi500hw:
  git config [user]
  git config file.
  Finish file system lab

Conflicts:
	.gitconfig
	lab/lab10/fsReader