This will be my commit message
Merge branch 'testerr'

Conflicts:
	README.md
Msg
This is my String-1 Branch