Realizar desafios
	modified:   src/fitbox/controller/RealizarActividadController.java
	modified:   src/fitbox/model/Desafio.java
Merge branch 'master' of https://github.com/elcanie/fitbox