Cleaned up task3.
Merge branch 'master' of github.com:sisu/uml

Conflicts:
	3.r