edit test in new branch
A py file added
Merge branch 'newbranch'

Conflicts:
	README.md
Only line 2 reserved in master
added edit 4
Merge branch 'newbranch'

Conflicts:
	README.md