Add new file
modify file
Merge branch 'master' of https://github.com/smarttaro/tarogit

Conflicts:
	新文字文件.txt