added maki
Merge branch 'master' of https://github.com/git-learning/hello-git