conflict
Merge branch 'master' of github.com:lkuczera/git-training-ug

Conflicts:
	derpina.txt