memory updates
Merge branch 'master' of https://github.com/daluce/cs124