Added comments for methods
edited the constructors in the 3 Task classes
merge differences in TimedTask
deleted display
Merge branch 'master' of
https://github.com/cs2103aug2014-w14-3j/main.git

Conflicts:
	src/controller/ControllerClass.java
Result: Merged
to Vishnu: I add 2 methods to convert from Task to string to store in
Storage and from String back to task
Note that for timedTask you have the startTime and endTime so you need
to implement getStartTime() and getEndTime() but you just implement
return startTime()????
implement add method(without return value (TODO))
added method to retrieve all tasks in storage
marged ControllerClass in master
Merge branch 'master' of https://github.com/cs2103aug2014-w14-3j/main.git
Implemented deletion of tasks
Implemented deletion of tasks
Merge branch 'master' of https://github.com/cs2103aug2014-w14-3j/main
edit method add & stringconvert
Simplifiy the entry point of the program
merge from master& add gui entry (not working)
Merge branch 'ui' of https://github.com/cs2103aug2014-w14-3j/main.git into ui