Merge pull request #48 from cs2103aug2014-w15-3J/master

Merge Logic with Master
minor typo mistake fixed exit(0)
Merge remote-tracking branch 'origin/Logic' into parser