udpate s.txt to minky
Merge branch 'master' of https://github.com/FuminHsu/tfcf

Conflicts:
	s.txt