tips
Merge pull request #1 from lkuczera/tips

git initial tips
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
added much wierszyk.txt