Merge remote-tracking branch 'origin/master'

Conflicts:
	Niggasoft/iDOLLUSION/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1.suo

	Niggasoft/iDOLLUSION/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1/bin/x86/Debug/iDOLLUSION_alpha_v1.exe

	Niggasoft/iDOLLUSION/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1/bin/x86/Debug/iDOLLUSION_alpha_v1.pdb

	Niggasoft/iDOLLUSION/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1/obj/x86/Debug/iDOLLUSION_alpha_v1.csprojResolveAssemblyReference.cache

	Niggasoft/iDOLLUSION/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1/obj/x86/Debug/iDOLLUSION_alpha_v1.exe

	Niggasoft/iDOLLUSION/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1/obj/x86/Debug/iDOLLUSION_alpha_v1.pdb

	Niggasoft/iDOLLUSION/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1Content/obj/x86/Debug/iDOLLUSION_alpha_v1Content.contentprojResolveAssemblyReference.cache
Merge remote-tracking branch 'origin/master'

Conflicts:
	Niggasoft/iDOLLUSION/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1.suo

	Niggasoft/iDOLLUSION/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1/bin/x86/Debug/iDOLLUSION_alpha_v1.exe

	Niggasoft/iDOLLUSION/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1/bin/x86/Debug/iDOLLUSION_alpha_v1.pdb

	Niggasoft/iDOLLUSION/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1/obj/x86/Debug/iDOLLUSION_alpha_v1.csprojResolveAssemblyReference.cache

	Niggasoft/iDOLLUSION/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1/obj/x86/Debug/iDOLLUSION_alpha_v1.exe

	Niggasoft/iDOLLUSION/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1/obj/x86/Debug/iDOLLUSION_alpha_v1.pdb

	Niggasoft/iDOLLUSION/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1/iDOLLUSION_alpha_v1Content/obj/x86/Debug/iDOLLUSION_alpha_v1Content.contentprojResolveAssemblyReference.cache