From: Jonathan Amery <jdamery+zgit@ysolde.ucam.org>
Date: Wed, 18 Mar 2015 18:04:06 +0000 (+0000)
Subject: Merge branch 'master' of /home/wiki/thymewiki/ThymeWiki
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~nmamery/git?a=commitdiff_plain;h=3c90fc21b9bc3b2a5cc8d05f4f0b01fb0398469f;hp=5175465a4bcab3e7ca6f44c78ec052796e58985b;p=ThymeWiki.git

Merge branch 'master' of /home/wiki/thymewiki/ThymeWiki
---

diff --git a/sandbox/Test_Test_One.mdwn b/sandbox/Test_Test_One.mdwn
index 5d59a95..3dd4cd6 100644
--- a/sandbox/Test_Test_One.mdwn
+++ b/sandbox/Test_Test_One.mdwn
@@ -1,18 +1,18 @@
 <br />
 |:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|
 |**_Spirtual Attributes_**||||||||||||||
-|*Willpower* | &#9679;&#9679;&#9679;&#9679;&#9679; &#9679;&#9679;|(7)|  |  |*Magick*|&#9679;&#9679;&#9679;&#9679;|(4)|  |  |*Resonance*|&#9679;|(1)|  |
-| &nbsp; ||||||||||||||
+|*Willpower* | &#9679;&#9679;&#9679;&#9679;&#9679; &#9679;&#9679;|(7)|  |&nbsp;|*Magick*|&#9679;&#9679;&#9679;&#9679;|(4)|  |&nbsp;|*Resonance*|&#9679;|(1)|  |
+|&nbsp;||||||||||||||
 
 |**_Attributes_**||||||||||||||
 |**Physical**||||&nbsp;|**Social**||||&nbsp;|**Mental**||||
-|*Strength*|&#9679;&#9679;|(2)|  | |*Charisma*|&#9679;&#9679;|(2)|  | |*Intelligence*|&#9679;&#9679;&#9679;&#9679;|(4)| Patterns |
-|*Dexterity*|&#9679;&#9679;|(2)|  | |*Manipulation*|&#9679;&#9679;&#9679;&#9679;|(4)| Soothing|  |*Wits*|&#9679;&#9679;&#9679;|(3)|  |
-|*Stamina*|&#9679;&#9679;|(2)|  | |*Appearance*|&#9679;&#9679;|(2)|  |  |*Perception*|&#9679;&#9679;&#9679;|(3)|  |
+|*Strength*|&#9679;&#9679;|(2)|  |&nbsp;|*Charisma*|&#9679;&#9679;|(2)|  |&nbsp;|*Intelligence*|&#9679;&#9679;&#9679;&#9679;|(4)| Patterns |
+|*Dexterity*|&#9679;&#9679;|(2)|  |&nbsp;|*Manipulation*|&#9679;&#9679;&#9679;&#9679;|(4)| Soothing|&nbsp;|*Wits*|&#9679;&#9679;&#9679;|(3)|  |
+|*Stamina*|&#9679;&#9679;|(2)|  |&nbsp;|*Appearance*|&#9679;&#9679;|(2)|  |&nbsp;|*Perception*|&#9679;&#9679;&#9679;|(3)|  |
 | &nbsp; ||||||||||||||
 
 |**_Abilities_**  ||||||||||||||
-| &nbsp; ||||||||||||||
+|&nbsp;||||||||||||||
 
 |**Strength**|  | |  | |**Dexterity**|  | |  | |**Stamina**|  |  |  |
 |*Brawl*|&#9679;|(1)|  | |*Athletics*|  |(0)|  | |*Endurance*|  |(0)|  |
@@ -23,7 +23,7 @@
 |  | |  | |  |*Melee*|  |(0)|  |  |  |  |  | |
 |  | |  | |  |*Pilot*|  |(0)|  |  |  |  |  | |
 |  | |  | |  |*Stealth*|  |(0)|  | |  | |  | |
-| &nbsp; ||||||||||||||
+|&nbsp;||||||||||||||
 
 |**Perception**|  | |  | |**Intelligence**|  | |  | |**Wits**|  |
 |*Awareness*|&#9679;&#9679;|(2)|  | |*Academics*|&#9679;&#9679;|(2)|  | |*Arts*|&#9679; |(1)|  |
@@ -35,19 +35,19 @@
 |  | |  | |  |*Medicine*|&#9679;|(1)|  | |  | |  | |
 |  | |  | |  |*Science*|&#9679;|(1)|  | |  | |  | |
 |  | |  | |  |*Survival*|&#9679;|(1)|  | |  | |  | |
-| &nbsp; ||||||||||||||
+|&nbsp;||||||||||||||
 
 |**Appearance**|  | |  | |**Manipulation**|  | |  | |**Charisma**|  |
 |*Intimidation*|  |(0)|  | |*Interrogation*|  |(0)|  | |*Command*|  |(0)|  |
 |*Style*|  |(0)|  | |*Streetwise*|  |(0)|  | |*Etiquette*|&#9679;&#9679; |(2)|  |
 |  | |  | |  |*Subterfuge*|  |(0)|  | |*Perform*|&#9679; |(1)|  |
-| &nbsp; ||||||||||||||
+|&nbsp;||||||||||||||
 
 |**_Backgrounds_** ||||||||||||||
 |Allies|  |(0)|  | |Contacts|&#9679;&#9679;|(2)|The two wizards|  |Mentor|&#9679;&#9679;|(2)|*Girion*|
 |Attunement|&#9679;&#9679;&#9679;|(3)|  | |Followers|  |(0)|  | |Resources|&#9679;&#9679; |(2)|  |
 |Backing|&#9679;&#9679; |(2)|Interpol M |  |Influence|  |(0)|  | |Talent|&#9679;&#9679;&#9679;  |(3)|  |
-|Cipher|&#9679;|(1)|  | |Magickal Material|  |(0)|  |  |  |  |  |  |  |
-| &nbsp; ||||||||||||||
+|Cipher|&#9679;|(1)|  | |Magickal Material|  |(0)|  |&nbsp;|||||
+|&nbsp;||||||||||||||