committing so i can pull whee -sk
Merge branch 'master' of https://github.com/skimcheese/pixel-tactics

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