Small fixes for discard pile
Merge branch 'master' of https://github.com/tibi22/MasterThesis.git