dic github_test conflict test
Merge branch 'master' of https://github.com/juno1988/juno_test