Cambio en memoria

asdsa
Merge branch 'master' of https://github.com/projectoninja/projectoninja