Desarrollando modo juego
Merge remote-tracking branch 'Enol/master'

Conflicts:
	res/layout/fragment_twos_complement.xml
	res/values/strings.xml
	src/es/uniovi/imovil/fcrtrainer/MainActivity.java
	src/es/uniovi/imovil/fcrtrainer/TwosComplementExerciseFragment.java
Arreglo twosComplement
Arreglo project properties
Merge remote-tracking branch 'choose_remote_name/master' into uo212

Conflicts:
	project.properties