mi primer commit
change col size on index
conflict on gitignore after pull resolved
conflict pull resolved