add test1
Merge branch 'dev' of https://github.com/Roarain/learngit into dev
fixed confi