commented out edittime in editattribute method
merging
resolve conflict
Merge branch 'master' of https://github.com/cs2103aug2014-w14-3j/main
Added comments for some methods