changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	TeReoRunner/Assembly-UnityScript-vs.unityproj
	TeReoRunner/Assembly-UnityScript.unityproj
	TeReoRunner/Assets/Scenes/RecordsScene.unity
	TeReoRunner/Assets/Sprites/StoneAA.png
	TeReoRunner/Assets/Sprites/StoneE.png
	TeReoRunner/Assets/Sprites/StoneM.png
	TeReoRunner/Assets/Sprites/StoneT.png
	TeReoRunner/Assets/Sprites/buttonInstructionsV1.png
	TeReoRunner/Assets/Sprites/buttonQuitV1.png
	TeReoRunner/Assets/Sprites/buttonRecordsV1.png
	TeReoRunner/Assets/Sprites/buttonStartV1.png
	TeReoRunner/ProjectSettings/EditorBuildSettings.asset
	TeReoRunner/TeReoRunner-csharp.sln
	TeReoRunner/TeReoRunner.sln
	TeReoRunner/TeReoRunner.userprefs