Revert "Merge pull request #42 from cs2103aug2014-w15-3J/master"