revert to previous commit
Merge branch 'previous'
Shuffle cards function now global function
Merge branch 'previous'
Added + updated some todo's