my first blog

ISSUE=IGNORE
添加.gitignore

ISSUE=IGNORE
Merge branch 'master' of github.com:PengXing/blog

Conflicts:
	.gitignore