Reimplemented isExpired()
Merge pull request #89 from cs2103aug2014-w15-3J/Logic

Reimplemented isExpired()