OK
Merge branch 'master' of github.com:miGlanz/szkolenie-git

Conflicts:
	hello.txt