magik
Merge branch 'master' of https://github.com/toxicbison/xX_P00N5L4Y3RZ_Xx

Conflicts:
	JackJackTyler/Assembly-CSharp-vs.csproj
	JackJackTyler/Assembly-CSharp.csproj
	JackJackTyler/JackJackTyler-csharp.sln
	JackJackTyler/JackJackTyler.sln
	JackJackTyler/Library/CurrentLayout.dwlt
	JackJackTyler/Library/assetDatabase3
	JackJackTyler/Library/guidmapper
removed stuff
fuck