Merge pull request #55 from cs2103aug2014-w15-3J/Logic

Merge Master with Logic
add in the display of current time(but cannot update time automatically T^T)
Merge pull request #56 from cs2103aug2014-w15-3J/Logic

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

Merge Logic with Master