A
Merge branch 'master' of https://github.com/JoRd118/PROP

Conflicts:
	Entrega2/EXE/Controlador_Domini_Planeta/Controlador_Domini_Planeta.java

Entrega2/EXE/Controlador_Domini_Planeta/Driver_Controlador_Domini_Planet
a.java