Fixed deck toString from creating a whole new deck
Fixed random errors
Fixed merge conflicts
Commit for merge