README.md
Modify README.md
Add README.txt
Add file about yum
Add hello.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md

	modified:   README.md