jehane added a second change without pulling the next one!
ok cool looks like it will work! Merge github.com:tsavas/My_New_Repository

Conflicts:
	test13nov.txt