Merge
Merge branch 'master' of https://github.com/cs2103aug2014-w10-4j/main
Minor fix in type field of Task