add
Merge branch 'master' of github.com:satoshun/my_setting