format the code.
Merge branch 'master' of https://github.com/cs2103aug2014-w10-2j/cs2103aug2014-w10-2j