added initial outline of memory
added details to memory.h
Merge branch 'indev'