Goodbye LaTeX, hello HTML
Merge remote-tracking branch 'origin/master'

Conflicts:
	latex-source/cv.tex