started game of life
Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.history/29/604dd1141d8700141c46a669a41d70b9
	.metadata/.plugins/org.eclipse.core.resources/.history/d4/400e4c491d8700141c46a669a41d70b9
	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab8.4/.indexes/e4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab8.4/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/ProgramAssign4/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/ProgramAssign5/.indexes/e4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.root/72.tree
	.metadata/.plugins/org.eclipse.core.resources/.root/75.tree
	.metadata/.plugins/org.eclipse.core.resources/.root/76.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/875937390.index
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/version.ini