Update resume.
Merge branch 'master' of github.com:mass/mass-web

Conflicts:
	img/resume.pdf