oh yay, merge conflicts

srctweb/website/static/css/style.css

@@ -93,7 +93,7 @@ a[name] {
 .project-icon {
   text-align:center;
   display: block;
-  font-size:130px;
+  font-size:100px;
   margin:0 auto;
   padding-bottom: 10px;
 }
@@ -110,7 +110,7 @@ a[name] {
   outline:0;
 }
 .project-icon-stacked {
-  font-size:65px;
+  font-size:55px;
 }
 .project-role {
   width: 150px;