merge development branch

@ryansobol Actually, rubocop suggested ```@cards.map(&:to_s).join(', ')``` as a simpler way. It makes sense to me so I put it in the file.