Resolved merge conflict

src/mixins/Helper.js

@@ -11,6 +11,25 @@ export default {
       return muscles;
     },
 
+    getKittens(count) {
+      let kittens = [];
+
+      for (let i = 0; i < count; i++) {
+        let width = this.getRandomInt(300, 600);
+        let height = this.getRandomInt(300, 600);
+        kittens.push(`https://placekitten.com/${width}/${height}`);
+      }
+
+      return kittens;
+    },
+
+    getRandomInt(min, max) {
+      min = Math.ceil(min);
+      max = Math.floor(max);
+      max++; // make it inclusive
+      return Math.floor(Math.random() * (max - min)) + min;
+    },
+
     getClientLocale() {
       if (navigator.language) {
         return navigator.languages[0];