Borrar conflictos
Merge branch 'master' of https://github.com/Aethaelias/blockbuster

Conflicts:
	articulos.txt
	bin/catalogo/Catalogo.class
	bin/vistas/MenuReponer.class
	bin/vistas/MenuTopTen.class