add ejxercise 26.php add font-family
Merge remote-tracking branch 'origin/master'

Conflicts:
	h1_25'(Votos)tableEstadistic,escala,file_Read'.php