hurrdurr i dont think i made changes but git is yelling at me
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/Pixel Tactics.csproj.FileListAbsolute.txt
	Pixel Tactics/obj/Debug/Pixel Tactics.exe
	Pixel Tactics/obj/Debug/Pixel Tactics.pdb
	Pixel Tactics/obj/Debug/Pixel Tactics_MarkupCompile.cache
	Pixel Tactics/obj/Debug/Pixel Tactics_MarkupCompile.i.cache
	Pixel Tactics/obj/Debug/Pixel Tactics_MarkupCompile.lref
added all the classes, and wrote a shuffle method, but no unit tests yet.