updated resume.md
Merge branch 'master' of https://github.com/lnanglin/lnanglin.github.io

Conflicts:
	resume.md
testing