diff --git a/.gitattributes b/.gitattributes
index fb3033d7cd1..7b4fdaf76aa 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -952,6 +952,7 @@ res/cardsfolder/caribou_range.txt -text svneol=native#text/plain
 res/cardsfolder/carnage_altar.txt -text svneol=native#text/plain
 res/cardsfolder/carnassid.txt -text svneol=native#text/plain
 res/cardsfolder/carnifex_demon.txt -text svneol=native#text/plain
+res/cardsfolder/carnival_of_souls.txt -text svneol=native#text/plain
 res/cardsfolder/carnivorous_plant.txt -text svneol=native#text/plain
 res/cardsfolder/carnophage.txt -text svneol=native#text/plain
 res/cardsfolder/carrier_pigeons.txt -text svneol=native#text/plain
@@ -3167,6 +3168,7 @@ res/cardsfolder/irini_sengir.txt -text svneol=native#text/plain
 res/cardsfolder/iron_barb_hellion.txt -text svneol=native#text/plain
 res/cardsfolder/iron_heart_chimera.txt svneol=native#text/plain
 res/cardsfolder/iron_lance.txt -text svneol=native#text/plain
+res/cardsfolder/iron_maiden.txt -text svneol=native#text/plain
 res/cardsfolder/iron_myr.txt -text svneol=native#text/plain
 res/cardsfolder/iron_star.txt -text svneol=native#text/plain
 res/cardsfolder/iron_tusk_elephant.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/carnival_of_souls.txt b/res/cardsfolder/carnival_of_souls.txt
new file mode 100644
index 00000000000..d5bfa98981a
--- /dev/null
+++ b/res/cardsfolder/carnival_of_souls.txt
@@ -0,0 +1,10 @@
+Name:Carnival of Souls
+ManaCost:1 B
+Types:Enchantment
+Text:no text
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a creature enters the battlefield, you lose 1 life and add B to your mana pool.
+SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ 1 | SubAbility$ SVar=DBMana
+SVar:DBMana:DB$Mana | Produced$ B
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/carnival_of_souls.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/iron_maiden.txt b/res/cardsfolder/iron_maiden.txt
new file mode 100644
index 00000000000..b145625641c
--- /dev/null
+++ b/res/cardsfolder/iron_maiden.txt
@@ -0,0 +1,10 @@
+Name:Iron Maiden
+ManaCost:3
+Types:Artifact
+Text:no text
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | IsPresent$ Card.YouDontCtrl | PresentZone$ Hand | PresentCompare$ GT4 | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of each opponent's upkeep, CARDNAME deals X damage to that player, where X is the number of cards in his or her hand minus 4.
+SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ Opponent | NumDmg$ X
+SVar:X:Count$InOppHand/Minus.4
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/iron_maiden.jpg
+End
\ No newline at end of file