Arreglado escalado VMP
Added gitignore
Merge branch 'master' into Escalado-VMP