Merge pull request #1 from twilightsparklehf/gh-pages

BIG SHINY GREEN BUTTON! I HAZ TO PRESS IT!
EoE fix
Secondary EoE fix
Merge pull request #2 from twilightsparklehf/master

Merging DiamondCardz's Changes