delete all
first
Merge branch 'master' of github.com:walt7870/gittest

Conflicts:
	README.md
	abc