merge conflict

alcarney · alcarney · commit c1172a16fa2b · 2014-10-23T18:14:49.000+01:00
diff --git a/index.html b/index.html
@@ -1,12 +1,21 @@
 <!DOCTYPE html>
+<html>
 <head>
-    <title>Code Club</title>
+    <title>Code Club Home</title>
+    <link rel="stylesheet" type="text/css" href="styles/main.css"/>
 </head>
 <body>
-<h1 id="cardiff-school-of-mathematics-code-club">Cardiff School of Mathematics Code Club</h1>
-<p>Meeting time: Thursdays at 16:00 in M/0.33</p>
-<p>(There might be doughnuts - if you're quick!)</p>
 
+<div class="main">
+    <h1 id="cardiff-school-of-mathematics-code-club">Cardiff School of Mathematics Code Club</h1>
+
+    <div class="main_body">
+        <p>Meeting time: Thursdays at 16:00 in M/0.33</p>
+        <p>(There might be doughnuts - if you're quick!)</p>
+        <p>Vince's favourite quote so far "love the fact that I'm learning Vim on the fly!" Adam, 2nd year student </p>
+        <p><a href='https://projecteuler.net'>Here's a link to the Euler problems.</a></p>
+    </div>
 <a href="sessions.html">Sessions</a>
+</div>
 </body>
 </html>
diff --git a/res/background.png b/res/background.png
diff --git a/styles/main.css b/styles/main.css
@@ -0,0 +1,27 @@
+body{                       /* Sets the background image for the site */
+    background-image: url('../res/background.png');
+}
+
+.main {                     /* This controls the "main" part of the page i.e. what goes in the centre column */
+    background-color: #000000;
+    position: absolute;
+    margin-top: 50px;
+	width: 50%;
+	left: 21%;
+    padding-left: 4%;
+    padding-right: 4%;
+    color: #00FF00;
+}
+
+a:link{
+	color: #FFFF00;
+}
+
+a:visited{
+	color: #FFFF50;
+}
+
+.main_body {                /* This controls the "body" of the main central column i.e. not the title */
+    margin-top: 50px;
+    color: #FFFFFF;
+}
