测试
修改过文件Merge branch 'master' of https://github.com/binape/code-snippets

Conflicts:
	example.md