Merge conflicts

Author: Nicholas Thomson

app/scripts/controllers/crunchinator.js

@@ -176,11 +176,12 @@ angular.module('crunchinatorApp.controllers')
     $scope.updateLookingFor = function() {
         var next_items = [];
         var current_count = $scope.lookingForList.length;
+        var page_size = 100;
         if($scope.lookingFor === 'companies') {
-            next_items = $scope.filteredCompaniesList.slice(current_count, current_count+50);
+            next_items = $scope.filteredCompaniesList.slice(current_count, current_count+page_size);
         }
         else if($scope.lookingFor === 'investors') {
-            next_items = $scope.filteredInvestorsList.slice(current_count, current_count+50);
+            next_items = $scope.filteredInvestorsList.slice(current_count, current_count+page_size);
         }
         $scope.lookingForList = $scope.lookingForList.concat(next_items);
     };

app/views/main.tpl.html

@@ -46,7 +46,11 @@ <h3 class='pull-left'>
                 </p>
                 <div class='textlist clear-both'>
                     <div class='dataset'>
-                        <table class='table table-striped table-hover' infinite-scroll="updateLookingFor()">
+                        <table
+                            class='table table-striped table-hover'
+                            infinite-scroll="updateLookingFor()"
+                            infinite-scroll-distance="2"
+                        >
                             <tbody>
                                 <tr ng-repeat="item in lookingForList">
                                     <td><a href='#'>{{item.name}}</a></td>