fix merge conflit

CardiffMathematicsCodeClub · Nov 6, 2014 · e0d8f6a · e0d8f6a
2 parents c806d46 + 861c8bf
commit e0d8f6a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/inspiration.html b/inspiration.html
@@ -64,7 +64,7 @@ <h3>Programming Languages</h3>
                 There are more programming languages than stars in the galaxy... OK
                 <i>slight</i> exaggeration but there are a lot of them. Created for any
                 possible purpose imaginable from building video games to driving rovers on Mars or
-                simply trying to <a href="languages/brainfuck.html">confuse</a> the programmer using them!
+                simply trying to <a href="languages/brainfk.html">confuse</a> the programmer using them!
             </p>
 
             </div>
@@ -113,7 +113,7 @@ <h3>Menu</h3>
         <a href="inspiration.html">Inspiration</a> <br />
         <br />
         Languages <br/>
-        <a href="languages/brainfuck.html"> Brainfuck</a> <br/>
+        <a href="languages/brainfk.html"> Brainf**k</a> <br/>
         <a href="languages/C.html">C</a> <br/>
         <a href="languages/C++.html">C++</a> <br/>
         <a href="languages/haskell.html">Haskell</a> <br/>

diff --git a/languages/C++.html b/languages/C++.html
@@ -18,7 +18,7 @@ <h3>Menu</h3>
         <a href="../inspiration.html">Inspiration</a> <br />
         <br />
         Languages <br/>
-        <a href="brainfuck.html"> Brainfuck</a> <br/>
+        <a href="brainfk.html"> Brainf**k</a> <br/>
         <a href="C.html">C</a> <br/>
         <a href="C++.html">C++</a> <br/>
         <a href="haskell.html">Haskell</a> <br/>

diff --git a/languages/C.html b/languages/C.html
@@ -18,7 +18,7 @@ <h3>Menu</h3>
         <a href="../inspiration.html">Inspiration</a> <br />
         <br />
         Languages <br/>
-        <a href="brainfuck.html"> Brainfuck</a> <br/>
+        <a href="brainfk.html"> Brainf**k</a> <br/>
         <a href="C.html">C</a> <br/>
         <a href="C++.html">C++</a> <br/>
         <a href="haskell.html">Haskell</a> <br/>

diff --git a/languages/brainfuck.html → languages/brainfk.html b/languages/brainfuck.html → languages/brainfk.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Brainfuck</title>
+    <title>Brainf**k</title>
     <link rel="stylesheet" type="text/css" href="styles/main.css"/>
 </head>
 <body>
 
     <div class="main">
-        <h1>Brainfuck</h1>
+        <h1>Brainf**k</h1>
     </div>
 
     <!-- Navigation Menu -->
@@ -18,7 +18,7 @@ <h3>Menu</h3>
         <a href="../inspiration.html">Inspiration</a> <br />
         <br />
         Languages <br/>
-        <a href="brainfuck.html"> Brainfuck</a> <br/>
+        <a href="brainfk.html"> Brainf**k</a> <br/>
         <a href="C.html">C</a> <br/>
         <a href="C++.html">C++</a> <br/>
         <a href="haskell.html">Haskell</a> <br/>

diff --git a/sessions.html b/sessions.html
@@ -25,7 +25,6 @@
     <link rel="stylesheet" href="styles/Custom_formating.css"/>
 
 </head>
-
 <body style="background-image: url(res/background.png)">
     <div class="container">
         <nav id="myNavbar" class="navbar navbar-inverse navbar-fixed-top" role="navigation">
@@ -56,8 +55,8 @@ <h1 style="font-size: 6vh; text-align: center;">Past Sessions</h1>
                 <ul>
 
                     <li class="well">
-                        <b>Week 1:</b> <i>"Real Men"</i><br/>
-                        <b>Quote of the Session</b> <i>"Only real men code in Arch!"</i> - Jason, PostGrad
+                        <b>Week 1:</b> <i>"Real Coders"</i><br/>
+                        <b>Quote of the Session</b> <i>"Only real coders code in Arch"</i> - Jason, PostGrad
                     </li>
 
                     <li class="well">