update script
Merge remote-tracking branch 'origin/master'

Conflicts:
	Unity/Assets/testScript.cs