Añadida pagina Joan
Pagina de curriculum
Añadido enlance al indice
Subido curriculum y enlace en index.html
Merge commit '82dce931148c2ad83e9a490812f4b10bdb52f8ac' into develop
Merge commit '976503731890bf585ec9dc212b85efe8d7f41364' into develop
Merge commit '82dce931148c2ad83e9a490812f4b10bdb52f8ac' into develop
creada pagina nico
añadido curriculum nicolas
Añadido nadal.html
Merge commit 'bc825e139128cce3dd882307a8ab3c566efe1be2' into develop

Conflicts:
	index.html
Merge commit '7297c9c5d97bf14733af255425a2267d8402e8ba' into develop

Conflicts:
	index.html

Solucionado en mi index
conflicto resuelto
Merge remote-tracking branch 'Jorge/develop' into develope

Conflicts:
	index.html