Merge branch 'master' of https://git.jean-cloud.net/adrian/metamorphose.git

Conflicts:
	src/index.html

src/index.html

@@ -33,8 +33,12 @@
 
         <section id="contact">
             <header>
+<<<<<<< HEAD
+                <h2>Contactez nougfffs</h2>
+=======
                 <h2>Contactez nous</h2>
             </header>
+>>>>>>> master
             <form action="http://localhost:8080/submit" method="POST">
                 <input type="hidden" name="token" value="s0y6WANzU1XnYERoJxMwekP9pqilSVLK5Gbf3hmZadHB2rQ4u8" />
                 <div>