Initial target testing
AF Test2

Conflicts:
	Puzzle/Assembly-CSharp-vs.csproj
	Puzzle/Assembly-CSharp.csproj
	Puzzle/Assets/Editor.meta
	Puzzle/Assets/Editor/QCAR.meta
	Puzzle/Assets/Editor/QCAR/CylinderTargetTextures.meta
	Puzzle/Assets/Editor/QCAR/CylinderTargetTextures/Majendie.meta

Puzzle/Assets/Editor/QCAR/CylinderTargetTextures/Majendie/Stones_small.B
ody_scaled.jpg.meta
	Puzzle/Assets/Editor/QCAR/FrameMarkerTextures.meta
	Puzzle/Assets/Editor/QCAR/Scripts.meta
	Puzzle/Assets/Plugins.meta
	Puzzle/Assets/Plugins/Android.meta
	Puzzle/Assets/Plugins/Android/libs.meta
	Puzzle/Assets/Plugins/Android/src.meta
	Puzzle/Assets/Plugins/Android/src/com.meta
	Puzzle/Assets/Plugins/Android/src/com/qualcomm.meta
	Puzzle/Assets/Plugins/QCARWrapper.bundle.meta
	Puzzle/Assets/Plugins/QCARWrapper.bundle/Contents.meta
	Puzzle/Assets/Plugins/QCARWrapper.bundle/Contents/Resources.meta
	Puzzle/Assets/Qualcomm Augmented Reality.meta
	Puzzle/Assets/Qualcomm Augmented Reality/Prefabs.meta
	Puzzle/Assets/Qualcomm Augmented Reality/Scripts.meta
	Puzzle/Assets/StreamingAssets.meta
	Puzzle/Assets/StreamingAssets/QCAR.meta
	Puzzle/Assets/StreamingAssets/QCAR/Majendie.dat
	Puzzle/Assets/StreamingAssets/QCAR/Majendie.xml
	Puzzle/Library/AssetServerCacheV3
	Puzzle/Library/InspectorExpandedItems.asset
	Puzzle/Library/ScriptMapper
	Puzzle/Library/assetDatabase3
	Puzzle/Library/guidmapper
	Puzzle/Library/metadata/b0/b09581e3227354306a1058a965e60f0b
	Puzzle/Puzzle-csharp.sln
	Puzzle/Puzzle.sln
	Puzzle/Puzzle.userprefs