Merge branch 'master' of https://github.com/jiajie999/jiajie999.github.io

Conflicts:
	README.md
Merge branch 'master' of https://github.com/jiajie999/jiajie999.github.io

Conflicts:
	.gitignore