config first
Merge branch 'master' of https://github.com/a132811/config