Merge branch 'develop' of https://github.com/TWINMOD/uDo into develop
Update .classpath

Signed-off-by: Nicholas Lum <nicholaslum444@hotmail.com>
Update licence
UPDATE LICENSE :dancer:
Update gitignore :dancer:

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

Conflicts:
	.gitignore
:dancer:
Merge pull request #25 from cs2103aug2014-t16-3j/develop

Develop