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

Conflicts:
	test/sg/edu/nus/comp/cs4218/impl/integrate/CatToolIntegrationTest.java