updated collate

Signed-off-by: Nicholas Lum <nicholaslum444@hotmail.com>
Merge pull request #184 from cs2103aug2014-t16-3j/develop

updated collate