modified:   FitBox/src/fitbox/controller/PantallaPrincipalController.java
	modified:   FitBox/src/fitbox/view/ConsultarVistaDiaria.fxml
	modified:   FitBox/src/fitbox/view/ConsultarVistaMensual.fxml
Merge branch 'master' of https://github.com/elcanie/fitbox

Conflicts:
	FitBox/nbproject/private/private.properties
	FitBox/nbproject/project.properties
	FitBox/src/fitbox/view/ConsultarVistaDiaria.fxml
	FitBox/src/fitbox/view/ConsultarVistaMensual.fxml
	FitBox/src/fitbox/view/ConsultarVistaSemanal.fxml

	modified:   FitBox/src/fitbox/controller/LoginController.java
	modified:   FitBox/src/fitbox/view/ConsultarVistaDiaria.fxml
	modified:   FitBox/src/fitbox/view/ConsultarVistaMensual.fxml
	modified:   FitBox/src/fitbox/view/ConsultarVistaSemanal.fxml
	modified:   FitBox/src/fitbox/view/ConsultarVistaDiaria.fxml
	modified:   FitBox/src/fitbox/view/ConsultarVistaMensual.fxml
	modified:   FitBox/src/fitbox/view/ConsultarVistaSemanal.fxml