update resume
Merge branch 'develop'