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

Merge Logic with Master
Merge pull request #132 from cs2103aug2014-w15-3J/Logic

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