Merge branch 'master' of horel.org:thibaut/foosball

Conflicts:
	rules.html
	schedule.html

1 files changed, 25 insertions, 21 deletions

diff --git a/rules.html b/rules.html
index a32fd2a..80c93fc 100644
--- a/rules.html
+++ b/rules.html
@@ -27,8 +27,8 @@
     
     <h2>Definitions</h2>
 
-    <p>We will use the following table to refer to refer to the different rods of
-    the table:</p>
+    <p>We will use the following table to refer to the different rods of
+    the foosball table:</p>
 
     <table>
         <tr><td>Row 1</td><td>Goalkeeper (1 foosman)</td></tr>
@@ -43,42 +43,42 @@
 
     <h2>Tournament structure</h2>
 
-    <p>The tournament is divided in two phases:
+    <p>The tournament is divided in two phases:</p>
     <ul>
         <li><em>Groupe phase:</em> the teams are divided in groups of two or
         three teams. Each team meets all the other teams in its group. The
-        worst team from each group of three teams leaves the tournament at the end
+        worse team from each group of three teams leaves the tournament at the end
         of this phase.</li>
         <li><em>Knockout phase:</em> this phase is organized as a single
         elimination bracket; 4 quarter-finals, 2 semi-finals, 1 final (and
-        1 final to decide the third place).</li>
-    </ul></p>
+        1 additional final to decide the third place).</li>
+    </ul>
 
     <h2>Organization of games</h2>
 
-    <p>The first team to score ten points wins the game</p>
+    <p>The first team to score 10 points wins the game.</p>
 
-    <p>There is a half-time when the first team reaches five points: the teams
-    switch sides, and the players inside a team can decide to swap positions
-    (the attacker becomes the defender and vice-versa). Swapping positions
-    during the half-time is <b>not</b> mandatory.</p>
+    <p>There is a half-time when the first team reaches five points: the two
+    teams switch sides, and the players inside a team can decide to swap positions
+    (the attacker becoming the defender and vice-versa). Swapping positions
+    during the half-time is <strong>not</strong> mandatory.</p>
 
     <p>The ball is served by the attacker on the side of the serving hole.</p>
 
     <h2>In-game rules</h2>
 
-    <p>When the ball stops and cannot be reached by any foosmen, the action to
+    <p>When the ball stops and cannot be reached by any foosman, the action to
     be taken depends on the position where the ball stopped:</p>
     <ul>
         <li>Before the third rod: the ball is put in the closest
-        corner</li>
+        corner;</li>
         <li>Between the third and sixth rods: the ball is served from the
-        middle</li>
+        middle;</li>
         <li>After the sixth rod: the ball is put in the closest
-        corner</li>
+        corner.</li>
     </ul>
     
-    <p>Things you cannot do:
+    <p>Things you cannot do:</p>
     <ul>
         <li><em>Spinning:</em> swiftly spinning the rods all around without
         holding them.
@@ -86,13 +86,17 @@
         touched by two foosmen from the scoring team on two different rods before
         a goal. If this requirement is not met, the goal does not count and the
         ball is simply served again from the middle.</li>
-    </ul></p>
+    </ul>
 
-    <p>Apart from that, everything is allowed, in particular:
+    <p>Apart from that, everything is allowed, in particular:</p>
     <ul>
-        <li>Scoring from the midfield during the game</li>
-        <li>Scoring from the attack rod without stopping the ball first</li>
-    </ul></p>
+        <li>Scoring from the midfield during the game;</li>
+        <li>Scoring from the attack rod without stopping the ball first.</li>
+      </ul>
+
+    <div id="beaver" class="center">
+        <img src="images/beaver.jpg" alt="kroOon" />
+    </div>
     </div> <!-- readable -->
     </article>
     <footer>