Cambios en README y matriz.rb
Merge branches 'ivan' and 'master'
Merge ivan into master
Merge branches 'mauri' and 'master'
Merge branches mauri into master
Arreglando errores
Merge branches 'master' and 'mauri' into mauri