add file feature3.1
add file feature3.1, with content
add line 1
Merge branch 'feature3.1b'

Conflicts:
	feature3.1.txt