edit through t1 branch
Adding one more line
added yet another line
Created new file
Creating file
Merge branch 't1'

Conflicts:
	sample2.rb