Adding test2.txt
merge me
another change
Merge branch 'codechix' into codechix2

Merged the first line of each file together.

Hope that was right...

Conflicts:
	merge.txt