修改忽略的文件
Merge branch 'master' of https://github.com/dragondjf/QMarkdowner

Conflicts:
	.gitignore