Convert memory into a struct.
Merge branch 'master' of https://github.com/hue03/CS3243October

Conflicts:
	Project5/PartTwo/partTwoTest.cpp
Merge both changes.