Merge origin/master

Conflicts:
	EAC5/src/ioc/eac5/Principal.java
	EAC5/src/ioc/eac5/derramas/Derramas.java
	EAC5/src/ioc/eac5/derramas/GestorDeDerramas.java
	EAC5/src/ioc/eac5/interfaz/Entrada.java
	EAC5/src/ioc/eac5/interfaz/Salida.java
	EAC5/src/ioc/eac5/junta/Junta.java