stiff
Merge branch 'master' of github.com:chadwyck/Ascension-CSSE376

Conflicts:
	Ascension/Ascension/Player.cs
	Ascension/UnitTestProject1/CardImprortTest.cs