Merge branch 'tys-ui' of https://github.com/cs2103aug2014-w14-2j/main into tys-ui
Merge branch 'tys-ui' of https://github.com/cs2103aug2014-w14-2j/main into tys-ui
parser checked after merging
Tasks now display time
tasks now display properly formatted time
resolving conflict
Merge branch 'master' into tys-ui