modified by git1dude
Merge branch 'master' of https://github.com/partheinstein/newgittest

Conflicts:
	test.txt