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

Conflicts:
	src/edu/kaist/g4/function/fileManager/Rules.java
Merge branch 'master' of https://github.com/psjung/VCSTool