Create README.md
commit test
fork test
dic github_test2 conflict test
dic github_test conflict test
Merge branch 'master' of https://github.com/juno1988/juno_test
dic github_test conflict test 2
dic github_test conflict test 2
dic github_test merged conflict file
dictionary commit test
resolve the problem