Tried to make a new superclass/subclass pairing with Card and CardLocation. Not sure it worked for the assignment.
Merge Memory/master

Conflicts:
	src/memory/Card.java