commit for merging
Merge branch 'master' of https://github.com/QJiePing/cs2103aug2014-w10-2j