Easter Eggs

-Working on easter eggs
Merge branch 'master' of https://github.com/Dig-Doug/EC327-Project

Conflicts:
	.metadata/.log

.metadata/.plugins/org.eclipse.core.resources/.projects/Beep/.indexes/a0
/d6/properties.index

.metadata/.plugins/org.eclipse.core.resources/.projects/Beep/.indexes/e4
/81/5f/4e/a0/history.index

.metadata/.plugins/org.eclipse.core.resources/.projects/Beep/.indexes/e4
/81/5f/4e/history.index

.metadata/.plugins/org.eclipse.core.resources/.projects/Beep/.indexes/pr
operties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Beep/.markers

.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.
index

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide
.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/2990356587.index
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.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.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml

Beep/bin/classes/com/beep_boop/Beep/startScreen/StartLevelActivity.class