modified:   src/fitbox/controller/PantallaPrincipalController.java
	modified:   src/fitbox/controller/RealizarEventosController.java
	modified:   src/fitbox/view/PantallaPrincipal_2.fxml
	modified:   src/fitbox/view/estilosToolBarYBotones.css
Merge branch 'master' of https://github.com/elcanie/fitbox

Conflicts:
	FitBoxMaster/src/fitbox/controller/RealizarEventosController.java