fixed things
Merge branch 'master' of https://github.com/Phoniks7/EGDGoodGrief

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/_Scenes/Master.unity
	Library/InspectorExpandedItems.asset
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper