Collated files
Merge branch 'master' of https://github.com/cs2103aug2014-w09-2j/main