fixed condition when deck is emptied
Merge branch 'dev' of https://github.com/the-hobbes/softwareEngineeringProject1 into dev