message2
qwerty
Merge branch 'master' of github.com:tasiddiqui/testing-repository

* 'master' of github.com:tasiddiqui/testing-repository:
  Update 2.txt

Conflicts:
	2.txt