Partially implemented CMI and Ticked functions
Edited the error in edit method and updated more of Tick and CMI
functions
Fully implemented CMI and Ticked. Waiting to integrate with Storage.
Merge pull request #49 from cs2103aug2014-w15-3J/Logic

Merge Master with Logic