Updated parser; debugging
Merge branch 'master' of https://github.com/cs2103aug2014-t10-3j/TaskBar-MainRepo