Merge remote-tracking branch 'upstream/master'

Author: Anupam-dagar

main/index.html

@@ -36,7 +36,6 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
                     </button>
 
                         <!--<a id="nav_home" href="#landing" class="nav-link">
@@ -58,9 +57,6 @@
                                 <li>
                                     <a id="nav_hackers" href="#contact" class="nav-link">CONTACT</a>
                                 </li>
-                                <li>
-                                    <a id="nav_hackers" href="https://hackcodeofconduct.org/530-hack_in_the_north_2018" class="nav-link">CODE OF CONDUCT</a>
-                                </li>
                             <!-- <li>
                                 <a href="404.html" class="nav-link call-to-action">LIVE</a>
                             </li> -->