first commit
ignore
Merge branch 'master' of https://github.com/dichengsiyu/dichengsiyu.github.io

Conflicts:
	.gitignore