2
Merge branch 'master' of https://github.com/massood/testrepo

Conflicts:
	test.txt
Merge branch 'master' of https://github.com/massood/testrepo
Merge branch 'master' of https://github.com/massood/testrepo.git