Add feature-C
fix encoding
Merge branch 'master' of github.com:artichoker/git-tutorial