Merge pull request #31 from SGover/master

Great Card Changes
Merge pull request #36 from SGover/AdeelTariq-alpha

Merge pull request #31 from SGover/master