Nueva configuracion
Merge branch 'master' of https://github.com/Azune/drunken-shame