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

Merge Logic with Master
Error in untick and unkiv resolved.
Merge pull request #114 from cs2103aug2014-w15-3J/Logic

Merge Master with Logic