Dao
Dao
	modified:   .gitignore
	new file:   FitBox/lib/jfxrt.jar
	modified:   FitBox/nbproject/configs/Run_as_WebStart.properties
	modified:   FitBox/nbproject/configs/Run_in_Browser.properties
	new file:   FitBox/nbproject/private/private.xml
	modified:   FitBox/nbproject/project.properties
Merge branch 'master' of https://github.com/elcanie/fitbox

Conflicts:
	FitBox/nbproject/project.properties

	modified:   FitBox/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
	modified:   FitBox/lib/nblibraries.properties
	new file:   FitBox/nbproject/UPDATED.TXT
	modified:   FitBox/nbproject/build-impl.xml
	modified:   FitBox/nbproject/genfiles.properties
	modified:   FitBox/nbproject/jfx-impl.xml
	new file:   FitBox/nbproject/jfx-impl_backup.xml
	modified:   FitBox/nbproject/private/private.properties
	modified:   FitBox/nbproject/project.properties
	modified:   FitBox/nbproject/project.xml
	new file:   FitBox/src/fitbox/MediaControl.java
	new file:   FitBox/src/fitbox/controller/RealizarActividadController.java
	new file:   FitBox/src/fitbox/view/RealizarActividad.fxml
	new file:   FitBox/src/fitbox/view/stylerealizaractivdad.css
	new file:   FitBox/src/imagenes/Button-Pause-icon.png
	new file:   FitBox/src/imagenes/Button-Play-icon.png
	new file:   FitBox/src/imagenes/Camera-icon.png
	new file:   FitBox/src/imagenes/Clock-icon.png
	new file:   FitBox/src/imagenes/Help-icon.png
	new file:   FitBox/src/imagenes/Home-icon.png