Merge branch 'v2' into gamecard

benchcoach/static/fonts/m+1m/m+1m.css

@@ -0,0 +1,38 @@
+@font-face {
+    font-family: 'm+1m';
+    src: url('mplus-1m-bold-webfont.woff') format('woff');
+    font-weight: bold;
+    font-style: normal;
+
+}
+
+@font-face {
+    font-family: 'm+1m';
+    src: url('mplus-1m-light-webfont.woff') format('woff');
+    font-weight: 300;
+    font-style: normal;
+
+}
+
+@font-face {
+    font-family: 'm+1m';
+    src: url('mplus-1m-medium-webfont.woff') format('woff');
+    font-weight: 500;
+    font-style: normal;
+
+}
+
+@font-face {
+    font-family: 'm+1m';
+    src: url('mplus-1m-regular-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+@font-face {
+    font-family: 'm+1m';
+    src: url('mplus-1m-thin-webfont.woff') format('woff');
+    font-weight: 100;
+    font-style: normal;
+}