my first commit
Additions two
Merge branch 'master' of https://github.com/iguananaut/testrepo

Conflicts:
	test.txt