diff --git a/CommentingPractice/comment-practice.js b/CommentingPractice/comment-practice.js
index d27ee4c..cfabbb0 100644
--- a/CommentingPractice/comment-practice.js
+++ b/CommentingPractice/comment-practice.js
@@ -85,8 +85,14 @@ import {OakTree} from './model/plant.js'
      
      console.log(giovann.helloWorld());
 
+<<<<<<< HEAD
+    var MyString2 = "My name is Ido";
+    consol.log(adil.myChars(MyString2));
+
+=======
      var name = "Richard";
      console.log(richard.randomVowels(name));
+>>>>>>> upstream/master
 
 
     //utilizing template.js model for task 3 ~ Kyle Kobayashi
diff --git a/CommentingPractice/model/dogs.js b/CommentingPractice/model/dogs.js
new file mode 100644
index 0000000..31f5bb5
--- /dev/null
+++ b/CommentingPractice/model/dogs.js
@@ -0,0 +1,73 @@
+/**
+ * @file dogs.js
+ * @author Ido Katz
+ */
+
+
+export default class Dogs {
+
+    /** 
+    * @description creates a Dogs object with a breed and age parameter 
+    *
+    * Constructor
+    * @param {string} breed - breed of Dog 
+    * @param {int} age - age of Dog in years
+    * 
+    */
+    constructor(breed, age) {
+        this.breed = breed;
+        this.age = age;
+    }
+
+    //function will return the breed of Dog.
+    getBreed() {
+        return this.breed;
+    }
+    //function will return the age of Dog.
+    getAge() {
+        return this.age;
+    }
+
+    //function will set the Breed of dog 
+    /**
+     * @param {string} breed - breed of Dog
+     */
+    setBreed(breed) {
+        this.breed = breed;
+    }
+    //function will set the age of dog 
+    /**
+     * @param {int} age - age of Dog
+     */
+    setBreed(age) {
+        this.breed = age;
+    }
+
+}
+
+/**
+* Labrador Class
+*/
+export class Labrador extends Dogs {
+
+    /**
+    * Constructor
+    */
+    constructor(age, color) {
+        super("Labrador") //calling constructor or paraent class
+        this.age = age;
+        this.color = color;
+    }
+
+    //function will return the color of Dog.
+    getColor() {
+        return this.color;
+    }
+
+    //function will set the color of dog 
+    /**
+     * @param {String} color - color of Dog
+     */
+    setBreed(color) {
+        this.breed = color;
+    }
diff --git a/CommentingPractice/README.md b/CommentingPractice/readme.md
similarity index 100%
rename from CommentingPractice/README.md
rename to CommentingPractice/readme.md
diff --git a/CommentingPractice/services/idoPractive.js b/CommentingPractice/services/idoPractive.js
new file mode 100644
index 0000000..bc4ed9d
--- /dev/null
+++ b/CommentingPractice/services/idoPractive.js
@@ -0,0 +1,6 @@
+let helloIdo = function () { //I copied this code from Sophia
+    console.log('Hello Ido')
+}
+
+let result = helloIdo();
+console.log(result);
\ No newline at end of file