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

Conflicts:
	.metadata/.log

.metadata/.plugins/org.eclipse.core.resources/.history/14/b0b94e73b04800
1311b3b91d0c00c9f9

.metadata/.plugins/org.eclipse.core.resources/.history/18/a0ee42b0af4800
1311b3b91d0c00c9f9

.metadata/.plugins/org.eclipse.core.resources/.history/60/e0ad2320b04800
1311b3b91d0c00c9f9

.metadata/.plugins/org.eclipse.core.resources/.history/9a/20029178b04800
1311b3b91d0c00c9f9

.metadata/.plugins/org.eclipse.core.resources/.history/a5/c027b17faf4800
1311b3b91d0c00c9f9

.metadata/.plugins/org.eclipse.core.resources/.history/c7/70e4df43af4800
1311b3b91d0c00c9f9

.metadata/.plugins/org.eclipse.core.resources/.history/d5/709ebfeaaf4800
1311b3b91d0c00c9f9
	.metadata/.plugins/org.eclipse.core.resources/.projects/CS2 - Class
Work/.indexes/e4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/CS2 - Class
Work/.markers

.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/.projects/Questions/.index
es/e4/b3/history.index

.metadata/.plugins/org.eclipse.core.resources/.projects/Questions/.marke
rs

.metadata/.plugins/org.eclipse.core.resources/.projects/Tetris/.indexes/
e4/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/.root/34.tree

.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/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat