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

Merge Logic with Master
Edited error catching exception for getLogic
Merge pull request #66 from cs2103aug2014-w15-3J/Logic

Merge Master with Logic