Add (and use) a new test helper method for capturing output from stdout
Merge branch 'master' into minitest-spec

Conflicts:
	spec/spec_helper.rb
	test/test_room.rb