variable naming and adjusted max iterations
Merge remote-tracking branch 'origin/master' into event_source
event for discarding cards and some refactorings