.metadata\.plugins
Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/ArraysAndStrings/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/ArraysAndStrings/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/BigOAnalysis/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/BigOAnalysis/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/LinkedLists/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/LinkedLists/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/StacksAndQueues/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/StacksAndQueues/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/SystemDesign/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/SystemDesign/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi