initial commit
Merge https://github.com/northben/git-learning