Merge remote-tracking branch 'origin/master'

# Conflicts:
#	assets/js/statsDisplay.js

assets/js/statsDisplay.js

@@ -5,24 +5,21 @@ let entryTemplate =
     '<span class="score-entry-points"></span>' +
     '</div>';
 
+function nameTeam(team){
+    if (team==='gli')
+    return "Glissefondor";
+    else if (team==='pek')
+        return "Peksentard";
+    else if (team==='boo')
+        return "Boomsouffle";
+    else
+        return "Verredaigle";
+
+}
 function showScores(team) {
-    let title = '';
-    switch (team) {
-        case 'gli':
-            title = 'Glissefondor';
-            break;
-        case 'pek':
-            title = 'Peksentard';
-            break;
-        case 'boo':
-            title = 'Boomsouffle';
-            break;
-        case 'ver':
-            title = 'Verredaigle';
-            break;
-    }
+    console.log(team);
     $.alert({
-        title: title,
+        title: nameTeam(team),
         theme: 'supervan',
         content: function () {
             let self = this;