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

Merge Logic with Master
Edited logic to prepare for integration with UndoManager
Merge pull request #63 from cs2103aug2014-w15-3J/Logic

Merge Master with Logic
Added Exception to Event Constructor
Redesigned Undo and Redo Methods
Added equals() method to Task, Date and Time class
Added *.json into gitignore

To prevent the commit of database file to repository
Merge branch 'parser'
comment off the part related to logic, focus on UI appearance first
Merge remote-tracking branch 'origin/master'
FIxed the constructor bug in Logic

Wrong constructor called for Event
Merge pull request #64 from cs2103aug2014-w15-3J/master

Merge Logic with Master
Edited error catching exception for getLogic
Fixed the equals() method in Task

consider different cases
Fixed the bugs in the constructor
Fixed the bug inside UndoManager
Merge pull request #65 from cs2103aug2014-w15-3J/parser

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

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

Merge Logic with Master
Bug in sorting of floating tasks and deadline tasks. Edited