Create README.md
add new line to file1.txt
Merge branch 'master' of github.com:nguyen-phuoc-mulodo/github_training into issue#1
Merge branch 'issue#1' of github.com:nguyen-phuoc-mulodo/github_training into issue#1
add 2nd on branch issue#1
Merge pull request #2 from nguyen-phuoc-mulodo/issue#1

Issue#1
fix conflict