Arreglados fallos al hacer merge
Merge branch 'pedro' of github.com:JugadorNumero12/JugadorNum12 into pedro
Merge branch 'develop' into pedro
Merge branch 'develop' into pedro
Merge branch 'develop' into pedro
Merge branch 'develop' into pedro
Merge branch 'develop' into pedro
Merge branch 'develop' into pedro
Cambio en AccionSingleton (finalizar lleva como parametro )
Accion FinalizarEvento
Accion OrganizarEvento