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

Conflicts:
	.metadata/.log

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab5-Example/.markers

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

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab5/.indexes/e4/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab5/.indexes/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab5/.markers

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

	.metadata/.plugins/org.eclipse.core.resources/.projects/Sayre-Project3/.markers

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

	.metadata/.plugins/org.eclipse.core.resources/.projects/Sayre-Project4/.markers

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

	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/8.tree

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

	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/2725142083.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.launching/.install.xml
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml