add conf
Merge branch 'master' of https://github.com/hlee13/xiaoju