motor work
Merge branch 'master' of https://github.com/ChrisGifford/PinataPursuit

Conflicts:
	2D Test/Assets/Standard Assets/Scripts/Camera Scripts/block2.prefab
	2D Test/Assets/Standard Assets/Scripts/Camera Scripts/block3.prefab
	2D Test/Assets/Standard Assets/Scripts/My Scripts/motion.js
	2D Test/Assets/portotype.unity
	2D Test/Assets/portotype2.unity
	2D Test/Library/CurrentLayout.dwlt
	2D Test/Library/InspectorExpandedItems.asset
	2D Test/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	2D Test/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	2D Test/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	2D Test/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	2D Test/Library/assetDatabase3
	2D Test/Library/guidmapper
	2D Test/Library/metadata/05/0509831167f6b4cbd99a2db31345cdcf
	2D Test/Library/metadata/09/0937af168d0984d90931e0f9b0a146b7
	2D Test/Library/metadata/0f/0f41679a0d6c8467e9a8298191020812
	2D Test/Library/metadata/19/19aa0d7864cfa471fa558dc5672744c6
	2D Test/Library/metadata/6d/6d3bb91761e314d0fbe47fb040c91bd3
	2D Test/Library/metadata/af/af6bb71a838894b69b2f1b2032f793b3
	2D Test/ProjectSettings/TagManager.asset
Motor work