Agregada una gilada
Merge branch 'master' of https://github.com/Tec-Pro/Quiniela

Conflicts:
	src/interfaz/MainGUI.java
Merge branch 'master' of https://github.com/Tec-Pro/Quiniela
Merge branch 'master' of https://github.com/Tec-Pro/Quiniela
movidas, varias, correciones
muchos cambios, demasiados