fuck
Merge branch 'master' of http://github.com/Natman64/JamLib

Conflicts:
	ShmupLib/ShmupLib.suo
	ShmupLib/ShmupLib/bin/Xbox 360/Release/ShmupLib.dll
	ShmupLib/ShmupLib/bin/Xbox 360/Release/ShmupLib.pdb
	ShmupLib/ShmupLib/bin/x86/Release/ShmupLib.dll
	ShmupLib/ShmupLib/bin/x86/Release/ShmupLib.pdb
	ShmupLib/ShmupLib/obj/Xbox 360/Release/ShmupLib.dll
	ShmupLib/ShmupLib/obj/Xbox 360/Release/ShmupLib.pdb
	ShmupLib/ShmupLib/obj/x86/Release/ShmupLib.dll
	ShmupLib/ShmupLib/obj/x86/Release/ShmupLib.pdb
	ShmupLib/SuperFishHunter/SuperFishHunter/bin/Xbox 360/Release/ShmupLib.dll
	ShmupLib/SuperFishHunter/SuperFishHunter/bin/Xbox 360/Release/ShmupLib.pdb
	ShmupLib/SuperFishHunter/SuperFishHunter/bin/Xbox 360/Release/SuperFishHunter.application
	ShmupLib/SuperFishHunter/SuperFishHunter/bin/Xbox 360/Release/SuperFishHunter.ccgame
	ShmupLib/SuperFishHunter/SuperFishHunter/bin/Xbox 360/Release/SuperFishHunter.exe
	ShmupLib/SuperFishHunter/SuperFishHunter/bin/Xbox 360/Release/SuperFishHunter.exe.manifest
	ShmupLib/SuperFishHunter/SuperFishHunter/bin/Xbox 360/Release/SuperFishHunter.pdb
	ShmupLib/SuperFishHunter/SuperFishHunter/bin/x86/Release/ShmupLib.dll
	ShmupLib/SuperFishHunter/SuperFishHunter/bin/x86/Release/ShmupLib.pdb
	ShmupLib/SuperFishHunter/SuperFishHunter/bin/x86/Release/SuperFishHunter.application
	ShmupLib/SuperFishHunter/SuperFishHunter/bin/x86/Release/SuperFishHunter.exe
	ShmupLib/SuperFishHunter/SuperFishHunter/bin/x86/Release/SuperFishHunter.exe.manifest
	ShmupLib/SuperFishHunter/SuperFishHunter/bin/x86/Release/SuperFishHunter.pdb
	ShmupLib/SuperFishHunter/SuperFishHunter/obj/Xbox 360/Release/SuperFishHunter.application
	ShmupLib/SuperFishHunter/SuperFishHunter/obj/Xbox 360/Release/SuperFishHunter.exe
	ShmupLib/SuperFishHunter/SuperFishHunter/obj/Xbox 360/Release/SuperFishHunter.exe.manifest
	ShmupLib/SuperFishHunter/SuperFishHunter/obj/Xbox 360/Release/SuperFishHunter.pdb
	ShmupLib/SuperFishHunter/SuperFishHunter/obj/Xbox 360/Release/Xbox 360 Copy of SuperFishHunter.csprojResolveAssemblyReference.cache
	ShmupLib/SuperFishHunter/SuperFishHunter/obj/x86/Release/SuperFishHunter.application
	ShmupLib/SuperFishHunter/SuperFishHunter/obj/x86/Release/SuperFishHunter.csprojResolveAssemblyReference.cache
	ShmupLib/SuperFishHunter/SuperFishHunter/obj/x86/Release/SuperFishHunter.exe
	ShmupLib/SuperFishHunter/SuperFishHunter/obj/x86/Release/SuperFishHunter.exe.manifest
	ShmupLib/SuperFishHunter/SuperFishHunter/obj/x86/Release/SuperFishHunter.pdb
	ShmupLib/SuperFishHunter/SuperFishHunterContent/obj/Xbox 360/Release/SuperFishHunterContent.contentprojResolveAssemblyReference.cache