Merge branch 'master' of https://github.com/tomnez/whoops

Conflicts:
	resume.html
	tom-netzband-resume.docx
	tom-netzband-resume.pdf
merge