Cambios menores
Merge branch 'master' of github.com:baenafrancisco/QRgameDUMA

Conflicts:
	README.md
	ranking/index.php
Arreglado problema con los commits