blah blah blah

script/teams.js

@@ -1,6 +1,7 @@
 define(['m', '_'], function (m, _) {
     var teams = {};
 
+<<<<<<< HEAD
     teams.getTeamColor = function(teamName){
         if(teamName == 'jaune'){
             return '#FF0';
@@ -21,8 +22,17 @@ define(['m', '_'], function (m, _) {
             return '#008000';
         }
 
-        return undefined;
+    teams.teams = function(){
+        return [
+            {name: 'jaune', color: '#FF0'},
+            {name:'rouge', color: '#F00'},
+            {name:'bleu', color: '#00F'},
+            {name:'gris', color: '#808080'},
+            {name:'vert', color: '#008000'},
+            {name: 'orange', color: '#FFA500'}
+        ];
     };
 
+
     return teams;
 });