update
update
Merge branch 'master' of https://github.com/csayre/Eclipse

Conflicts:
	.metadata/.log

.metadata/.plugins/org.eclipse.core.resources/.projects/JSONExample/org.
eclipse.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.projects/Lab3/org.eclipse
.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.projects/Lab4/org.eclipse
.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.projects/Lab5-Example/org
.eclipse.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.projects/Lab5/org.eclipse
.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/NASA World
Wind LOD Tutorial/org.eclipse.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.projects/Sayre-Project3/o
rg.eclipse.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.projects/Sayre-Project4(N
ew)/org.eclipse.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.projects/Sayre-Project4/o
rg.eclipse.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.projects/Sayre-Project5/o
rg.eclipse.egit.core/GitProjectData.properties

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui
.prefs
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1995173708.index
	.metadata/.plugins/org.eclipse.jdt.core/3000285004.index
	.metadata/.plugins/org.eclipse.jdt.core/305854171.index
	.metadata/.plugins/org.eclipse.jdt.core/3065916431.index
	.metadata/.plugins/org.eclipse.jdt.core/3133528496.index
	.metadata/.plugins/org.eclipse.jdt.core/3974580528.index
	.metadata/.plugins/org.eclipse.jdt.core/4108727661.index
	.metadata/.plugins/org.eclipse.jdt.core/4155206848.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	Sayre-Project5/.classpath