updated card form
Merge branch 'master' of https://github.com/8thavenger/MagicTheGatheringCollection

Conflicts:
	MagicTheGathering/MagicTheGathering/App.config
merge