new resume
Merge branch 'prod' of https://github.com/hoffoo/stayke.net into prod

Conflicts:
	htmlrc.vim