up
Merge branch 'master' of https://github.com/neha01mittal/HRRN

Conflicts:
	src/sg/edu/nus/comp/cs4218/impl/extended2/CutTool.java
	test/sg/edu/nus/comp/cs4218/impl/extended2/WcToolTest.java
	test/sg/edu/nus/comp/cs4218/impl/integrate/GrepIntegrationTest.java