Añadida la parte de Inés
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/fragment_protocol.xml
	src/es/uniovi/imovil/fcrtrainer/FragmentFactory.java
	src/es/uniovi/imovil/fcrtrainer/ProtocolExerciseFragment.java