Update spec_helper.rb
Update spec_helper.rb
Update Gemfile
Update Gemfile
Update spec_helper.rb
Update card_deck.gemspec

[skip ci]
Update Gemfile
Update Gemfile
Update card_deck.gemspec
Update card_deck.gemspec
Update card_spec.rb
Update deck_spec.rb
Update card_spec.rb
Update .travis.yml
Update .travis.yml
Update card_deck.gemspec
Merge branch 'master' of https://github.com/Zrp200/card_deck

Conflicts:
	spec/lib/deck_spec.rb