updates for individual programming assignment lesson 8
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/memory/HelpMenuControl.java
	src/memory/HelpMenuView.java
	src/memory/Memory.java
	src/memory/OptionsMenuControl.java
	src/memory/PlayMenuControl.java