commit 5 - added a line to the readme fiel.
added new text file testing-st2.txt
added line to readme 4:33.
add line to test-branch1
Merge branch 'test-branch1'

* test-branch1:
  add line to test-branch1
  added line to readme 4:33.
  added new text file testing-st2.txt
  commit 5 - added a line to the readme fiel.

Conflicts:
	README.md
	testing-st2.txt