Merge branch 'master' into Thurs22.1

Author: SterlingChin

src/components/home/homeCtrl.js

@@ -20,14 +20,11 @@ angular.module('app').controller('homeCtrl', function($scope, $state, mainServic
     // the random kata is stored on $scope.randomKata.
     // If there is a button you can link the button to $scope.getRandomKata
 
-    $scope.init = () => {
-<<<<<<< HEAD
-        // $scope.getUser();
-        $scope.getRandomKata(mainService.user.id);
-=======
-        $scope.getUser();
-
->>>>>>> master
-    }
+    $scope.getUser();
+    
+    // $scope.init = () => {
+    //     $scope.getUser();
+        
+    // }
 
 });

src/components/mainService.js

@@ -151,7 +151,6 @@ angular.module('app').service('mainService', function($http, $q, $sce) {
   }
 
 this.rankCalculator = (user) => {
-  console.log(user);
   switch (true) {
     case user.points < 12:
       return user.kyu_level = 8;

src/components/solutions/solutionsCtrl.js

@@ -9,7 +9,7 @@ angular.module('app').controller('solutionsCtrl', function($scope, $state, mainS
         mainService.getKataById(kataid).then(response => {
             $scope.kataById = response.data;
             $scope.getKataSolutions($scope.kataid);
-            console.log($scope.katabyId);
+            console.log($scope.kataById);
         })
     }