edited [all-day]
Merge branch 'master' of https://github.com/cs2103Taug2014-t09-2j/main.git