Added Motivacion and Organizacion de la Memoria
Fixing conflicts