Alpha 0.1 posibilidad de reiniciar la partida
Merge remote-tracking branch 'origin/master'

Conflicts:
	Topetes/src/ventanas/VentanaPrincipal.java