Merge branch 'master' of ../workspace

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/exam1/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/homework/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project10/.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/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml