Añadida pagina Joan
Pagina de curriculum
Añadido enlance al indice
Merge commit '82dce931148c2ad83e9a490812f4b10bdb52f8ac' into develop
Añadido nadal.html
Merge commit 'bc825e139128cce3dd882307a8ab3c566efe1be2' into develop

Conflicts:
	index.html
a
dfs