bug in edit time fixed
am/pm supported in time parsing
Merge pull request #111 from cs2103aug2014-w15-3J/Logic

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

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

Merge Logic with Master