From Alex
Merge branch 'master' of https://github.com/orest/GitFundamentals