Merge pull request #161 from SethGower/develop

adds favicon

Author: mbillow

conditional/templates/base.html

@@ -9,6 +9,7 @@
         <meta name="author" content="">
         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
 
+        <link rel="shortcut icon" href="https://assets.csh.rit.edu/uploads/favicon.ico" type="image/x-icon">
         <link href="/static/css/app.css" rel="stylesheet">
         {% block extraHeader %}
         {% endblock %}