rolling changes from LearnGit
Merge branch 'master' of https://github.com/avilay/LearnGit