Twig templates
Merge branch 'master' of https://github.com/eduardobenito10/cvonline

Conflicts:
	index.php