add c
sss1
sfsfsfs
Masssfsferge branch 'test'

Conflicts:
	c.txt