mover & attractor
Merge branch 'master' of https://github.com/martinysa/Unity

Conflicts:
	Chapter1/MoverClass/Assembly-UnityScript.pidb
	Chapter1/MoverClass/Assets/cameraTouchBehavior.js
	Chapter1/MoverClass/Assets/mainGameSetup.js
	Chapter1/MoverClass/Assets/moverScene.unity
	Chapter1/MoverClass/Library/ScriptAssemblies/Assembly-UnityScript.dll

Chapter1/MoverClass/Library/ScriptAssemblies/Assembly-UnityScript.dll.md
b
	Chapter1/MoverClass/Library/assetDatabase3
	Chapter1/MoverClass/Library/guidmapper

Chapter1/MoverClass/Library/metadata/7f/7f7f82ac4f11737488f0b13c4c5a5509

Chapter1/MoverClass/Library/metadata/92/9203fa234cba3744a990a0447de22899
	Chapter1/MoverClass/MoverClass-csharp.sln
	Chapter1/MoverClass/MoverClass.sln
	Chapter1/MoverClass/MoverClass.userprefs