tips
Merge pull request #1 from lkuczera/tips

git initial tips
readme conflict