Pre-merge commit
Merge branch 'master' of https://github.com/Entena/Project4
Made memory manager functional to write across buffer lines.