commit
Merge branch 'master' of https://github.com/davors/Celtra-Jackpot

Conflicts:
	Jackpot/experiments.py