5
asd
Merge branch 'master' of https://github.com/Xheradon/juego.git

Conflicts:
	vista/cabecera2.php