Estoy haciendo el juego
Merge remote-tracking branch 'upstream-enol/master' into ines

Conflicts:
	res/values/strings.xml
First approach to game mode
Merge with upstream
Merge branch 'master' of https://github.com/enoler/imovil2014
Restoring to last version
Deleting not necessary files
The Random object is created only once
Functional game mode
Changes in the game mode
Añadidas mas preguntas. Los botones ocupan mas espacio.
Las preguntas se generan aleatoriamente.
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 pull request #43 from InesN/ines

Ines-Modo juego de operaciones logicas
Merge remote-tracking branch 'choose_remote_name/master' into uo212

Conflicts:
	project.properties
Merge pull request #49 from tiborux/beltran

Cambios en la función showAnimation y startGame.
Merge with upstream