Añadida pagina Joan
Merge commit '82dce931148c2ad83e9a490812f4b10bdb52f8ac' into develop
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