commented out edittime in editattribute method
merging
resolve conflict
commit all
added the merged version of the 3 Task classes
Merge branch 'master' of https://github.com/cs2103aug2014-w14-3j/main
Added comments for some methods
Added exception for delete if user enters task number out of range
Corrected exception handling for delete and edit
Added function to append task number to each task string
merge from master& add gui entry (not working)
solve conflict
minor
merge from master& add gui entry (not working)
minor
minor
Merge branch 'ui' of https://github.com/cs2103aug2014-w14-3j/main.git into ui