marked code with tag for collate
fixed bug in parser
Merge branch 'master' of https://github.com/cs2103aug2014-t16-2j/main.git