Test de nuevo lodge
Merge branch 'master' of github.com:fjsandov/testing2013-2