diff --git a/.gitattributes b/.gitattributes
index f148b98f0a2..300309331d6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4642,6 +4642,7 @@ res/cardsfolder/g/grisly_salvage.txt -text
 res/cardsfolder/g/grisly_spectacle.txt -text
 res/cardsfolder/g/gristle_grinner.txt svneol=native#text/plain
 res/cardsfolder/g/gristleback.txt svneol=native#text/plain
+res/cardsfolder/g/grixis.txt -text
 res/cardsfolder/g/grixis_battlemage.txt svneol=native#text/plain
 res/cardsfolder/g/grixis_charm.txt svneol=native#text/plain
 res/cardsfolder/g/grixis_grimblade.txt svneol=native#text/plain
diff --git a/res/cardsfolder/g/grixis.txt b/res/cardsfolder/g/grixis.txt
new file mode 100644
index 00000000000..c802359f4ff
--- /dev/null
+++ b/res/cardsfolder/g/grixis.txt
@@ -0,0 +1,13 @@
+Name:Grixis
+ManaCost:no cost
+Types:Plane Alara
+S:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Graveyard | Affected$ Creature.YouOwn+Blue,Creature.YouOwn+Red,Creature.YouOwn+Black | AddAbility$ Unearth | AddSVar$ Unearthed & TrueDeath & Unavailable | Description$ Blue, black, and/or red creature cards in your graveyard have unearth. The unearth cost is equal to the card's mana cost. (Pay the card's mana cost: Return it to the battlefield. The creature gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
+SVar:Unearth:AB$ ChangeZone | Cost$ CardManaCost | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | SorcerySpeed$ True | ActivationZone$ Graveyard | SubAbility$ Unearthed | PrecostDesc$ Unearth | StackDescription$ Unearth: Return CARDNAME to the battlefield. | SpellDescription$ (Pay the card's mana cost: Return CARDNAME to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
+SVar:Unearthed:DB$ Pump | Defined$ Self | KW$ Haste & HIDDEN If CARDNAME would leave the battlefield, exile it instead of putting it anywhere else. | Permanent$ True | SubAbility$ TrueDeath | StackDescription$ It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield.
+SVar:TrueDeath:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ Unavailable | TriggerDescription$ Exile CARDNAME at the beginning of the next end step.
+SVar:Unavailable:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Exile
+T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll Chaos, put target creature card from a graveyard onto the battlefield under your control.
+SVar:RolledChaos:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | TgtPrompt$ Choose target creature card in a graveyard | ValidTgts$ Creature
+SVar:Picture:http://www.wizards.com/global/images/magic/general/grixis.jpg
+Oracle:Blue, black, and/or red creature cards in your graveyard have unearth. The unearth cost is equal to the card's mana cost. (Pay the card's mana cost: Return it to the battlefield. The creature gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)\nWhenever you roll {C}, put target creature card from a graveyard onto the battlefield under your control.
+SetInfo:HOP Common
\ No newline at end of file
diff --git a/res/cardsfolder/i/inferno_trap.txt b/res/cardsfolder/i/inferno_trap.txt
index d4342c79f1a..ddc29c2837d 100644
--- a/res/cardsfolder/i/inferno_trap.txt
+++ b/res/cardsfolder/i/inferno_trap.txt
@@ -2,10 +2,10 @@ Name:Inferno Trap
 ManaCost:3 R
 Types:Instant Trap
 A:SP$ DealDamage | Cost$ 3 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature.
-A:SP$ DealDamage | Cost$ R | CheckSVar$ CreaturesAttacked | SVarCompare$ GE2 | ValidTgts$ Creature | References$ CreaturesAttacked | TgtPrompt$ Select target creature | NumDmg$ 4 | SpellDescription$ (Pay only {R}) CARDNAME deals 4 damage to target creature.
+A:SP$ DealDamage | Cost$ R | CheckSVar$ CreaturesAttacked | SVarCompare$ GE2 | ValidTgts$ Creature | References$ CreaturesAttacked | TgtPrompt$ Select target creature | NumDmg$ 4 | SpellDescription$ If you've been dealt damage by two or more creatures this turn, you may pay R rather than pay CARDNAME's mana cost.
 SVar:CreaturesAttacked:Count$YourDamageSourcesThisTurn Creature
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/inferno_trap.jpg
-Oracle:If you've been dealt damage by two or more creatures this turn, you may pay {R} rather than pay CARDNAME's mana cost.\nCARDNAME deals 4 damage to target creature.
-SetInfo:ZEN Uncommon
-SetInfo:ARC Uncommon
\ No newline at end of file
+Oracle:If you've been dealt damage by two or more creatures this turn, you may pay {R} rather than pay Inferno Trap's mana cost.\nInferno Trap deals 4 damage to target creature.
+SetInfo:ARC Uncommon
+SetInfo:ZEN Uncommon
\ No newline at end of file