Sync
sync
Merge branch 'master' of https://github.com/trevorsargent/CS2

Conflicts:
	.metadata/.log

.metadata/.plugins/org.eclipse.core.resources/.history/96/70330244264c00
131cb49f3f512d3d5b
	.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/Connect4/org.ecl
ipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/Drawing
Test/org.eclipse.jdt.core/state.dat

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

.metadata/.plugins/org.eclipse.core.resources/.projects/Hangman/org.ecli
pse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/Hello/.markers

.metadata/.plugins/org.eclipse.core.resources/.projects/Hello/org.eclips
e.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/Klondike
Solitaire/org.eclipse.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.projects/LeapYear/org.ecl
ipse.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.projects/Mastermind/.mark
ers

.metadata/.plugins/org.eclipse.core.resources/.projects/Mastermind/org.e
clipse.jdt.core/state.dat

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

.metadata/.plugins/org.eclipse.core.resources/.projects/Questions/org.ec
lipse.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.projects/Tetris/.indexes/
e4/c7/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Tetris/.markers

.metadata/.plugins/org.eclipse.core.resources/.projects/Tetris/org.eclip
se.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/2156371998.index
	.metadata/.plugins/org.eclipse.jdt.core/2890882890.index
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat