moje
Merge branch 'master' of https://github.com/damlox/uml

Conflicts:
	fdgdfgdgf.txt
nowa wersja