additional adjectives added for status
Merge branch 'master' into testBranch2

Conflicts:
	ruby_class_test.rb
removed 'happy'
Merge pull request #5 from ShirleyS/testBranch2

Test branch2