Update
Merge branch 'master' of github.com:quentin-/curriculum-vitae

Conflicts:
	templates/cv.html