merge branches

Author: tkbeili

dog.rb

@@ -8,7 +8,7 @@ def initialize(color, type)
   def give(bone)
     # ensuring that the dog has less than three bones in order to accept a new
     # one
-    if @bones.length < 6
+    if @bones.length < 7
       # add the bone to the bones array
       @bones << bone
     else