Actualizacin archivos  para landing
Resolved conflicts again!
Merge branch 'master' of https://github.com/vim-bogota2/ix