class 10.21 part 1
Merge branch 'master' of https://github.com/trevorsargent/CS2

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/CS2 - Class
Work/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/CS2 - Class
Work/org.eclipse.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.projects/Connect4/.marker
s

.metadata/.plugins/org.eclipse.core.resources/.projects/Hangman/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Hello/.markers

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml