Committing incidentally modified files to pull
Merge branch 'master' of https://github.com/skimcheese/pixel-tactics
committing so I can pull
Merge branch 'master' of https://github.com/skimcheese/pixel-tactics

Conflicts:
	Pixel Tactics/bin/Debug/Pixel Tactics.exe
	Pixel Tactics/bin/Debug/Pixel Tactics.pdb
	Pixel Tactics/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Pixel Tactics/obj/Debug/MainWindow.baml
	Pixel Tactics/obj/Debug/MainWindow.g.cs
	Pixel Tactics/obj/Debug/Pixel Tactics.exe
	Pixel Tactics/obj/Debug/Pixel Tactics.g.resources
	Pixel Tactics/obj/Debug/Pixel Tactics.pdb
	Pixel Tactics/obj/Debug/Pixel Tactics_MarkupCompile.cache
	Pixel Tactics/obj/Debug/Pixel Tactics_MarkupCompile.i.cache