commit parcial
Merge branch 'master' of github.com:Laski/ing2