Small modification
Merge branch 'master' of https://github.com/azatris/cs4218

Conflicts:
	test/sg/edu/nus/comp/cs4218/impl/extended2/COMMToolTest.java
no message