hurrdurr committing so i can pull and get things working -sk
Merge branch 'master' of https://github.com/skimcheese/pixel-tactics

Conflicts:
	Pixel Tactics/Board.cs
	Pixel Tactics/Card.cs
changed card and added my stuff -sk
Merge branch 'master' of https://github.com/skimcheese/pixel-tactics