BOOM
Merge branch 'master' of https://github.com/Enagan/P3SJShennanigans

Conflicts:
	UnityProj/Assembly-CSharp-vs.csproj