Merge pull request #1 from burnman/master

test
add 新增文件测试 :octocat
hi
Merge branch 'master' of github.com:lvwzhen/wiki-thus
add 新增文件测试 :octocat:
:trollface:
img test
:wine_glass:
add .gitignore
Merge pull request #1 from lvwzhen/master

pull