hai funny bunny
Merge pull request #6 from piotrl/derpina

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

Conflicts:
	derpina.txt
Merge branch 'master' of https://github.com/lkuczera/git-training-ug