add new file
modify a file
modify dfsdfasdf
Merge branch 'master' of https://github.com/adik4141/gitcht

Conflicts:
	新文字文件.txt