Little changes, committing in preparation for a pull.
Merge branch 'master' of https://github.com/jsdodgers/Bel-Nix.git

Conflicts:
	BelNix/Assembly-CSharp-vs.csproj
	BelNix/Assembly-CSharp.csproj
	BelNix/BelNix-csharp.sln
	BelNix/BelNix.sln
	BelNix/BelNix.userprefs
	BelNix/Library/AssetServerCacheV3
	BelNix/Library/CurrentLayout.dwlt
	BelNix/Library/ScriptMapper
	BelNix/Library/assetDatabase3
	BelNix/Library/expandedItems
	BelNix/Library/guidmapper
	BelNix/Library/metadata/00/00000000000000002000000000000000
	BelNix/Library/metadata/00/00000000000000003000000000000000
	BelNix/Library/metadata/00/00000000000000004000000000000000
	BelNix/Library/metadata/00/00000000000000004100000000000000
	BelNix/Library/metadata/00/00000000000000005000000000000000
	BelNix/Library/metadata/00/00000000000000005100000000000000
	BelNix/Library/metadata/00/00000000000000006000000000000000
	BelNix/Library/metadata/00/00000000000000006100000000000000
	BelNix/Library/metadata/00/00000000000000007000000000000000
	BelNix/Library/metadata/00/00000000000000008000000000000000
	BelNix/Library/metadata/00/00000000000000009000000000000000
	BelNix/Library/metadata/00/0000000000000000a000000000000000
	BelNix/Library/metadata/00/0000000000000000b000000000000000
	BelNix/Library/metadata/00/0000000000000000c000000000000000
	BelNix/Library/metadata/0d/0d7f24fad8269457b9e9eedc9ded196a
	BelNix/Library/metadata/4d/4d4edb6dc969a4909ad6b760fabc5673
Trying to fix the updating issues with the ignore stuff.
Trying this some more.
Merge branch 'master' of https://github.com/jsdodgers/Bel-Nix.git

Conflicts:
	BelNix/Assembly-CSharp-vs.csproj
	BelNix/Assembly-CSharp.csproj
	BelNix/BelNix-csharp.sln
	BelNix/BelNix.sln
	When I Awoke/ProjectSettings/AudioManager.asset
	When I Awoke/ProjectSettings/EditorBuildSettings.asset
	When I Awoke/ProjectSettings/GraphicsSettings.asset
	When I Awoke/ProjectSettings/TimeManager.asset