f
fsf
Merge branch 'master' of https://github.com/YOYOFat/mytest
ok

Conflicts:
	f1.txt