Fix merge errors.

Author: nickthegroot

settings.html

@@ -16,18 +16,13 @@
 <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>
+        <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>