commit after failed merge attempt
commit with metadata from -pc
got rid of metadata laptop
delete bots
something happened on pc
Merge branch 'test-without-metadata' of https://github.com/ElijahHudley/testing3 into test-without-metadata

Conflicts:
	xmldataloader/Library/ScriptAssemblies/Assembly-CSharp.dll
	xmldataloader/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	xmldataloader/Library/assetDatabase3
merge projects with no meta
merged with no meta pc
1
12
9*
with meta laptop
added new files from save pc
Merge branch 'master' of https://github.com/ElijahHudley/testing3

Conflicts:
	xmldataloader/Assembly-CSharp-Editor.pidb
	xmldataloader/Assets/TestScript.cs
	xmldataloader/Library/ScriptAssemblies/Assembly-CSharp.dll
	xmldataloader/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	xmldataloader/Library/assetDatabase3
Merge branch 'master' of https://github.com/ElijahHudley/testing3
	modified:   xmldataloader/Assembly-UnityScript.pidb
	new file:   xmldataloader/Assets/ObjectMerge/merge-unity.js
	new file:   xmldataloader/Assets/ObjectMerge/merge-unity.js.meta
	new file:   xmldataloader/Assets/ObjectMerge/merge-unity.vbs
	new file:   xmldataloader/Assets/ObjectMerge/merge-unity.vbs.meta
	new file:   xmldataloader/prefab.backup
	new file:   xmldataloader/prefab.snapshot
	new file:   xmldataloader/prefab.sort
Merge remote-tracking branch 'origin/test-without-metadata'

Conflicts:
	xmldataloader/Assembly-CSharp-Editor.pidb
	xmldataloader/Assembly-CSharp.csproj
	xmldataloader/Assembly-CSharp.pidb
	xmldataloader/Assembly-UnityScript-vs.unityproj
	xmldataloader/Assembly-UnityScript.pidb
	xmldataloader/Assembly-UnityScript.unityproj
	xmldataloader/Assets/1.unity.meta
	xmldataloader/Assets/ObjectMerge.meta
	xmldataloader/Assets/TK2DROOT/tk2dTileMap_demo.meta
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/Font/OldSansBlack/UIDemoOldSansBlack data.prefab
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/UIDemoSpriteCollection.prefab
	xmldataloader/Assets/TK2DROOT/tk2d_demo/democameradata/DemoCameraSpriteCollection.prefab
	xmldataloader/Assets/TK2DROOT/tk2d_demo/democameradata/DemoCameraSpriteCollection_Data/data.prefab
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/DemoSpriteCollection.prefab
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/SpriteCollection_Data/data.prefab
	xmldataloader/Assets/TK2DROOT/tk2d_demo/multiatlas/DemoMultiAtlas.prefab
	xmldataloader/Assets/TK2DROOT/tk2d_demo/multiatlas/DemoMultiAtlas_Data/data.prefab
	xmldataloader/Assets/TK2DROOT/tk2d_demo/spider/DemoSpiderSpriteCollection.prefab
	xmldataloader/Assets/TK2DROOT/tk2d_demo/spider/Spider_Data/data.prefab
	xmldataloader/Assets/XmlDataLoader.unity
	xmldataloader/Library/AssetServerCacheV3
	xmldataloader/Library/ScriptAssemblies/Assembly-CSharp.dll
	xmldataloader/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	xmldataloader/Library/ScriptAssemblies/Assembly-UnityScript.dll
	xmldataloader/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	xmldataloader/Library/ScriptMapper
	xmldataloader/Library/assetDatabase3
	xmldataloader/Library/guidmapper
	xmldataloader/Library/metadata/0b/0b167d00b3108411a8a963cba5ddde1b
	xmldataloader/Library/metadata/1d/1d5ac211a643e447ca78c2d794a16381
	xmldataloader/Library/metadata/23/2314ce3a3eecf4816bad3c9eca4de2e1
	xmldataloader/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	xmldataloader/Library/metadata/b3/b365e6042890d4b1987423ed6bb8a08c
	xmldataloader/Library/metadata/ca/ca49380a71a2bb64c830d06bd421b9d1
	xmldataloader/Library/metadata/e5/e53c8c3dcc4ff59438bc9e86cb45c3f6
	xmldataloader/xmldataloader.userprefs
	modified:   xmldataloader/Assets/TestScript.cs