Pantalla finalizada
Pantalla finalizada
	modified:   FitBox/src/fitbox/view/ActividadController.java
	modified:   FitBox/src/fitbox/view/ControlledScreen.java
	modified:   FitBox/src/fitbox/view/DisplayShelf.java
	modified:   FitBox/src/fitbox/view/PantallaPrincipalController.java
	modified:   FitBox/src/fitbox/view/PerspectiveImage.java
	modified:   FitBox/src/fitbox/view/ScreensController.java
	modified:   FitBox/src/fitbox/view/ScreensFramework.java
Merge branch 'master' of https://github.com/rubpana/fitboxPantallaPrincipal

Conflicts:
	FitBox/src/fitbox/view/PantallaPrincipal.fxml
	FitBox/src/fitbox/view/PantallaPrincipalController.java

	modified:   FitBox/src/fitbox/view/PantallaPrincipal.fxml
	modified:   FitBox/src/fitbox/view/PantallaPrincipalController.java