adquisicion lista
Merge branch 'master' of https://github.com/jercc20/ProyectoProgra2

Conflicts:
	src/logica/Adquisicion.java