Merge pull request #181 from nickescallon/dev

Implemented Shuffle Functionality - Some bugs detailed in Comments
Added On-deck functionality
Merge pull request #182 from deini/dev

Added On-deck functionality