I=php modificaciones
Merge branch 'master' of github.com:Niquify/Geek-s-Den