Merge pull request #82 from cs2103aug2014-t16-3j/develop

Develop
refactored. added collated folder.

Engine#loadFile() changed to private, activated in constructor instead of
in the uDo class.

Signed-off-by: Nicholas Lum <nicholaslum444@hotmail.com>
Merge branch 'develop' of https://github.com/cs2103aug2014-t16-3j/main into develop
mistake in previous previous commit. Engine#loadFile() only commited here.

Signed-off-by: Nicholas Lum <nicholaslum444@hotmail.com>
Merge branch 'master' of https://github.com/cs2103aug2014-t16-3j/main.git into develop