Update Person1 to not be off-by-one, also overwrite project files
Merge origin/master

Conflicts:
	M2/nbproject/build-impl.xml
	M2/nbproject/genfiles.properties
	M2/nbproject/project.properties
	M2/nbproject/project.xml
Merge origin/master

Conflicts:
	M2/nbproject/build-impl.xml
	M2/nbproject/genfiles.properties
	M2/nbproject/project.properties
	M2/nbproject/project.xml
Switch JDK_1.8 to JDK 1.8