Use minitest's spec syntax
Rename the test directory to spec and rename the test files
Merge branch 'master' into minitest-spec

Conflicts:
	spec/spec_helper.rb
	test/test_room.rb
Merge branch 'minitest-spec'