some stuff
blah
Merge branch 'master' of https://github.com/davors/Celtra-Jackpot

Conflicts:
	Jackpot/Jackpot.py
	Jackpot/evaluation.py