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

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

Conflicts:
	Jackpot/Jackpot.py
	Jackpot/Jackpot.pyproj
blah
Merge branch 'master' of https://github.com/davors/Celtra-Jackpot