parser logging off
collated file
Merge branch 'master' of https://github.com/cs2103aug2014-t14-4c/main into mybranch