Revert "cohesion"

This reverts commit 4310e23eabefe58d4b217e2b5dafe76827140577.
cohesion
Merge branch 'master' of https://github.com/cs2103aug2014-w15-2j/main