updated gitignore
delete local Library folder
Merge branch 'master' of https://github.com/traintrackcn/G1

Conflicts:
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/95/95d9a2fa2ab8944c8a826677f9215fab