This is another commit yay!
Another Commit!
Merge github.com:tsavas/My_New_Repository

Conflicts:
	test13nov.txt
Another commit, let's see if it works!