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
	modified:   MERGETEST/Assets/NewBehaviourScript.cs
Merge branch 'master' into testMerge

Conflicts:
	MERGETEST/Assets/TestScript.cs
	xmldataloader/Assembly-CSharp-Editor.pidb
	xmldataloader/Assembly-CSharp-vs.csproj
	xmldataloader/Assembly-CSharp.csproj
	xmldataloader/Assembly-CSharp.pidb
	xmldataloader/Assembly-UnityScript-vs.unityproj
	xmldataloader/Assembly-UnityScript.pidb
	xmldataloader/Assembly-UnityScript.unityproj
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/Font/OldSansBlack/UIDemoOldSansBlack data.prefab
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/Sprites/Checkbox.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/Sprites/CheckboxHighlight.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/Sprites/Checkbox_X.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/Sprites/DropDownButton.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/Sprites/DropDownButtonHover.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/Sprites/InputItemBackground.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/Sprites/InputItemBackgroundHover.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/Sprites/InputItemBackgroundHoverSolid.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/Sprites/RadioButton.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/Sprites/RadioButtonDot.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/Sprites/RadioButtonHover.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/Sprites/Scrollbar.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/Sprites/ScrollbarButtonUpDown.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/Sprites/ScrollbarButtonUpDownHover.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/Sprites/ScrollbarThumbButton.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/Sprites/ScrollbarThumbButtonHover.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/Sprites/SlicedButton.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/Sprites/SlicedButton_Hover.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/Sprites/WhiteSquare.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/Sprites/WhiteSquareAnchorTopLeft.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/Sprites/background.png.meta
	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/democameradata/source/heart_empty.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/democameradata/source/heart_full.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/democameradata/source/heart_half.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/democameradata/source/window.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/DemoSpriteCollection.prefab
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/SpriteCollection_Data/data.prefab
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/2dtoolkit_logo.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/Brown Block.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/Chest Closed.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/Rock.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/Stone Block.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/animdemo/animdemo_1.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/animdemo/animdemo_2.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/animdemo/animdemo_3.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/animdemo/animdemo_4.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/animdemo/animdemo_5.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/background.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/bg.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/bg1.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/bubble_green.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/bubble_orange.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/bubble_red.psd.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/button_down.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/button_up.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/cloud1.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/cloud2.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/crate.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/explosiontest/core.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/explosiontest/explosion_beam.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/explosiontest/smoke.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/ground.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/platform.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/platform_spiked.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/sheep_0.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/sheep_1.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/sheep_2.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/slicedButton_down.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/slicedButton_up.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/smoke/smoke0.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/smoke/smoke1.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/smoke/smoke2.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/smoke/smoke3.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/smoke/smoke4.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/smoke/smoke5.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/starspike.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/sun.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/sprites/wavyground.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/multiatlas/DemoMultiAtlas.prefab
	xmldataloader/Assets/TK2DROOT/tk2d_demo/multiatlas/DemoMultiAtlas_Data/data.prefab
	xmldataloader/Assets/TK2DROOT/tk2d_demo/multiatlas/explosion_44FR.png.meta
	xmldataloader/Assets/TK2DROOT/tk2d_demo/spider/DemoSpiderSpriteCollection.prefab
	xmldataloader/Assets/TK2DROOT/tk2d_demo/spider/Spider_Data/data.prefab
	xmldataloader/Assets/XmlDataLoader.unity
	xmldataloader/Assets/level1-Theirs.unity
	xmldataloader/Library/AssetServerCacheV3
	xmldataloader/Library/ProjectSettings.asset
	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/expandedItems
	xmldataloader/Library/guidmapper
	xmldataloader/Library/metadata/00/00000000000000002000000000000000
	xmldataloader/Library/metadata/00/00000000000000003000000000000000
	xmldataloader/Library/metadata/00/00000000000000004000000000000000
	xmldataloader/Library/metadata/00/00000000000000009000000000000000
	xmldataloader/Library/metadata/00/0000000000000000c000000000000000
	xmldataloader/Library/metadata/0b/0b167d00b3108411a8a963cba5ddde1b
	xmldataloader/Library/metadata/1d/1d5ac211a643e447ca78c2d794a16381
	xmldataloader/Library/metadata/23/2314ce3a3eecf4816bad3c9eca4de2e1
	xmldataloader/Library/metadata/24/24d5a7324133e49eeb75fa8aab4dfbe9
	xmldataloader/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	xmldataloader/Library/metadata/b3/b365e6042890d4b1987423ed6bb8a08c
	xmldataloader/Library/metadata/ca/ca49380a71a2bb64c830d06bd421b9d1
	xmldataloader/Library/metadata/e5/e53c8c3dcc4ff59438bc9e86cb45c3f6
	xmldataloader/xmldataloader-csharp.sln
	xmldataloader/xmldataloader.sln
	xmldataloader/xmldataloader.userprefs