Update resume.
Merge branch 'master' into develop