this is the first commit for testing1
this is commit for master
testing1 merge master fix conflict
add branch testing1
this is branch addtext
add remote addtext
Merge branch 'addtext'

Conflicts:
	readme.txt