Interfaz grafica primera etapa concluida
Merge branch 'master' of https://github.com/malusoce96/Tarea1-Repositorio-Algoritmos

Conflicts:
	MusicTecPlayer/src/musictecplayer/administradores/HiloReproductor.java
	MusicTecPlayer/src/musictecplayer/vistas/Reproductor.java
Merge branch 'master' of https://github.com/malusoce96/Tarea1-Repositorio-Algoritmos

Conflicts:
	MusicTecPlayer/src/musictecplayer/vistas/Reproductor.java