Merge origin/master

Conflicts:
	EAC5/src/ioc/eac5/Principal.java
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	EAC5/src/ioc/eac5/Principal.java
Merge origin/master

Conflicts:
	EAC5/src/ioc/eac5/interfaz/Entrada.java