k

k
Merge branch 'master' of https://github.com/Trifectgaming/2D-Runner

Conflicts:
	#Assembly-CSharp.pidb
	#Assets/Scenes/ContinuousRunner.unity
	#ProjectSettings/ProjectSettings.asset