prueba2
Merge branch 'master' of https://github.com/gmoretti/computer-arch-project

Conflicts:
	README.md