Se sube peer william felipe rojas
Merge branch 'master' of https://github.com/gaudisolutions/ecos