merge
Merge branch 'master' of https://github.com/JuanGaVS/gamers_paradise
merge