IDonparser changes
Merge branch 'master' of github.com:cs2103aug2014-w11-2j/main
fixed merge conflict