gitignore
Merge branch 'master' of github.com:mrozu/gitWorkshop

merge