Committed Changes
Merge branch 'master' of https://github.com/skimcheese/pixel-tactics

Conflicts:
	Pixel Tactics/Card.cs
Merge branch 'master' of https://github.com/skimcheese/pixel-tactics

Conflicts:
	Pixel Tactics/Cards/Templar.cs