.gitignore should now work locally!
Merge remote-tracking branch 'origin/master'

Conflicts:
	Unity/Library/ScriptAssemblies/Assembly-CSharp.dll
	Unity/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Unity/Library/assetDatabase3
	Unity/Library/guidmapper
Merge remote-tracking branch 'origin/master'