修改:         resume.html
Merge branch 'master' of https://github.com/cjiejie/cjiejie.github.io

Conflicts:
	resume.html