Merge pull request #39 from cs2103aug2014-w10-3j/parser/Victor

Parser/victor
Merge branch 'master' into logic/wenhao