update
Merge branch 'master' of https://github.com/lizhizhou/resume

Conflicts:
	LiZhiZhouResume.doc