Merge branch 'master' of https://github.com/elotroalex/git_tutorial

grant's new change