Edit Email
Reedit Email
Merge branch 'master' of https://github.com/zmj64351508/resume

Conflicts:
	Resume_en.md