Merge branch 'master' of https://github.com/cs2103aug2014-w14-2j/main
Merge branch 'master' into xjy-parser
merged with master