Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/exam1/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/homework/.indexes/e4/4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/homework/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/homework/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/project10/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project11/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project2/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project3/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project4/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project6/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project7/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project8/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/temp/.markers
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/2603447019.index
	.metadata/.plugins/org.eclipse.jdt.core/4249857446.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.debug.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.jdt.junit/dialog_settings.xml
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties