Makefile added, along with memory.c update