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

Merge Logic with Master
Edited logic to prepare for integration with UndoManager
Merge pull request #63 from cs2103aug2014-w15-3J/Logic

Merge Master with Logic