Hello
Merge branch 'master' of https://github.com/PerceptionStudy/Study1

Conflicts:
	UnityProject/Assets/Scripts/scene1/MainScript.cs
Solved conflics