Set up rspec and replace minitest with it
Convert specs from minitest syntax to rspec syntax
Merge branch 'master' into rspec

Conflicts:
	spec/spec_helper.rb
Merge branch 'master' into rspec

Conflicts:
	Rakefile
	text_adventure.gemspec
Merge branch 'master' into rspec

Conflicts:
	text_adventure.gemspec
Merge branch 'rspec'
Merge branch 'master' of https://github.com/hollyhastings/text_adventure