tips
Merge pull request #1 from lkuczera/tips

git initial tips
pliczki
test2
hai funny bunny
Beautiful poem by Stefan S.
Takie tam haiku
usuniete puste pliki
Merge pull request #6 from piotrl/derpina

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

Conflicts:
	derpina.txt
tips for updating your local master if you work on master in your fork
Merge pull request #3 from ljercha/test

Test
Merge pull request #7 from siepet/poem

Beautiful poem by Stefan S.
Merge pull request #8 from pwyszynski/tips

Takie tam haiku
fix conflict