solve comflict
Merge branch 'master' of https://github.com/psjung/VCSTool.git

Conflicts:
	src/edu/kaist/g4/function/fileManager/Reader.java