I also add other.txt
Merge branch 'dev' of github.com:yanweicode/test into dev