Apply favicon and link fixes to dev branch

MoralCode · MoralCode · commit d7f78a063181 · 2018-12-12T14:37:17.000-08:00
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -11,10 +11,10 @@
         <meta name="apple-mobile-web-app-status-bar-style" content="translucent">
         <link rel="apple-touch-icon" sizes="512x512" href="icons/classclockicon-512.png">
         <link rel="apple-touch-icon" sizes="192x192" href="icons/classclockicon-192.png">
+        <link rel="shortcut icon" type="image/png" href="/icons/classclockicon-512.png" />
         <link rel="manifest" href="/manifest.json">
         <link href="https://fonts.googleapis.com/css?family=Play|Source+Sans+Pro" rel="stylesheet">
         
-        
     </head>
     <body onload="{{ page.onload |default: "" }}">
         {{ content }}
diff --git a/settings.html b/settings.html
@@ -16,13 +16,18 @@
 <section id="credits" class="centered topSpace">
 
     <a class=" topSpace bottomSpace" href="https://github.com/MoralCode/ClassClock">View on GitHub</a>
+<<<<<<< HEAD
     <a class=" topSpace" href="https://github.com/MoralCode/ClassTime/issues/new/choose">Submit Feedback</a><br>
     <p id="credits" class="">
         Idea By: <a href="https://twitter.com/MrKumprey">Dan Kumprey</a>
         <br>Created by: <a href="https://www.adriancedwards.com">Adrian Edwards</a> and
         <a href="https://nbdeg.com/">Nick Degroot</a>
         <br><a href="https://github.com/MoralCode/ClassClock/graphs/contributors">Contributors</a>
     </p>
+=======
+    <a class=" topSpace" href="https://github.com/MoralCode/ClassClock/issues/new/choose">Submit Feedback</a><br>
+    <p id="credits" class="">Idea By: <a href="https://twitter.com/MrKumprey">Dan Kumprey</a><br><a href="https://github.com/MoralCode/ClassClock/graphs/contributors">Contributors</a></p>
+>>>>>>> master
 </section>
 
 
