add a setting
Merge branch 'master' of github.com:haruyama/Settings