commit... IDK what is happening
Merge branch 'master' of https://github.com/Tungsten314/AoPS-Java-Programming-with-Data-Structures

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.history/1a/80f11223ff8c00131ed4e98e04f86cb8
	.metadata/.plugins/org.eclipse.core.resources/.history/5d/803f1312fe8c00131ed4e98e04f86cb8
	.metadata/.plugins/org.eclipse.core.resources/.history/7f/b0540552098d0013192491029c46e87d
	.metadata/.plugins/org.eclipse.core.resources/.history/a1/f0adf609fe8c00131ed4e98e04f86cb8
	.metadata/.plugins/org.eclipse.core.resources/.projects/Java Files/.indexes/e4/c3/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Java Files/.indexes/e4/e9/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Java Files/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Java Files/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/4259809859.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/Java Files/2014/2/6/refactorings.history
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/Java Files/2014/2/6/refactorings.index
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	Java Files/src/week14/AList.java
	Java Files/src/week14/AOPSListGeneric.java
	Java Files/src/week14/NameManager.java