Merge branch 'master' of /home/wiki/playersguide/PlayersGuide

Conflicts:
	The_Golden_Circle/Character_Creation/Partial_Powers/Logrus.mdwn

diff --cc The_Golden_Circle/Character_Creation/Partial_Powers/Logrus.mdwn
index 08bc94ae638767de7f44a0fef02d648533ec3de6,789938fb26b3378bec01bbf9aaf3aff93c4e56fa..c21a379f2b6b4092e20114919229e14c930dec67
--- 1/The_Golden_Circle/Character_Creation/Partial_Powers/Logrus.mdwn
--- 2/The_Golden_Circle/Character_Creation/Partial_Powers/Logrus.mdwn
+++ b/The_Golden_Circle/Character_Creation/Partial_Powers/Logrus.mdwn
@@@ -2,10 -2,10 +2,14 @@@
  
  ----
  
+ Logrus can only be taken if you have at least 2 points of Bad Stuff. See [[the note|Notes_on_Powers#logrus]]. 
+ 
+ ----
+ 
 +[[Logrus.png]]
 +
 +----
 +
  **Basic Logrus Mastery (25)** (Automatic Shape Shift, Chaosian Grandparent)
  
  : The Chaosian with this has walked the Logrus and recovered from the

diff --cc The_Golden_Circle/Character_Creation/Partial_Powers/Trump.mdwn
Simple merge