Merge branch 'master' of https://git.etud.insa-toulouse.fr/rees/progWeb

history_mythology.html

@@ -13,7 +13,7 @@
         <nav class="B">
                     <a href = "main.html">Main Page</a>
                     <a href = "where_to_go.html">Where To Go</a>
-                    <a href = "history_mythology.html">History</a>
+                    <a href = "history_mythology.html">History and Mythology</a>
                     <a href = "food_lifestyle.html">Food and Lifestyle</a>
                     <a href = "faq.html">Frequently Asked Questions</a>
         </nav>
@@ -56,7 +56,6 @@
             <p id = "Greece"><b>New Greece</b></p>
             <p>Britain, France and Russia wanted Greece to become a monarchy as well. They sent a prince that became the king of Greece in 1833.  </p>
             <p>Greece became a republic in 1924. In 1940, the Italians invaded Greece but they were quickly pushed back.</p>
-        
         </article> 
     </section>
     

main.html

@@ -10,7 +10,7 @@
             <nav class="B">
                         <a href = "main.html">Main Page</a>
                         <a href = "where_to_go.html">Where To Go</a>
-                        <a href = "history_mythology.html">History</a>
+                        <a href = "history_mythology.html">History and Mythology</a>
                         <a href = "food_lifestyle.html">Food and Lifestyle</a>
                         <a href = "faq.html">Frequently Asked Questions</a>
             </nav>