Merge branch 'ss-20'

Conflicts:
	TCPrototype/Assets/Scripts/TargetPosition.cs
	TCPrototype/Assets/Scripts/Timer.cs