Merge branch 'master' into Yoshua
codekit
termino y condiciones
Merge branch 'master' into Yoshua

Conflicts:
	config.codekit
Cambios sanos css
Merge branch 'Yoshua'