Fixed issue with shuffle function

Issue with one of the loops
Merge branch 'Fixing-Content' of https://github.com/vu1p3n0x/CS206Project into Fixing-Content