edit readme file from master branch
Merge remote-tracking branch 'origin/test1'

Conflicts:
	README.md