Merge branch 'Yoshua'
Merge branch 'Yoshua'
Cambios en index
Animaciones funcionan chido
Textos y contacto
Lightboxes
Merge branch 'master' into Yoshua

Conflicts:
	config.codekit