verison2
version2
Merge branch 'curry'

Conflicts:
	sample.txt
fixed conflicts
modified last line
modified last line on master
modified all

Conflicts:
	sample.txt