Updated classes and collate file
Merge branch 'master' of https://github.com/cs2103aug2014-t09-3j/main