update resume
Merge branch 'master' of github.com:hiveer/hiveer.github.io

Conflicts:
	resume.html