add OnGUI
resolve merge conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/TargetScript.cs