change grep directory
Merge branch 'master' of https://github.com/ruijie89/4218-Shell

Conflicts:
	Shell/src/sg/edu/nus/comp/cs4218/impl/extended1/GREPTool.java