combined all new changes into one
Merge branch 'master' of github.com:apkjet/git-tutorial