edited ver.
Merge branch 'master' of https://github.com/cs2103aug2014-t11-4j/main