Changed favorite color
Merge branch 'testbranch'

Conflicts:
	Samplefile3.txt
Merge branch 'testbranch'

Conflicts:
	Samplefile3.txt
Removed Samplefile,txt.orig