can discard unless you just picked up from the discard pile
Merge branch 'Fixing-Content' of https://github.com/vu1p3n0x/CS206Project into Fixing-Content