un caxo de index
Merge branch 'master' of https://github.com/israelantezana/yosistemas
error de conflicto con schema.rb
Merge branch 'master' of https://github.com/israelantezana/yosistemas
inicio arreglado
Merge branch 'master' of https://github.com/israelantezana/yosistemas