Added memoria.md
Merge branch 'master' of https://github.com/Concurrente/practica7