wtf
Merge branch 'master' of https://github.com/ejs09f/slotMachine

Conflicts:
	.metadata/.log

.metadata/.plugins/org.eclipse.core.resources/.projects/SlotMachine/.ind
exes/e4/history.index

.metadata/.plugins/org.eclipse.core.resources/.projects/SlotMachine/.mar
kers.snap

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

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

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.la
unching.prefs

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.u
i.prefs

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.edi
tors.prefs

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide
.prefs
	.metadata/.plugins/org.eclipse.jdt.core/3621991748.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
a