asd
Merge branch 'develop' of https://github.com/cs2103aug2014-t16-3j/main into develop

Conflicts:
	logs/engineLog.log
del log

Signed-off-by: Nicholas Lum <nicholaslum444@hotmail.com>
ya