Merge branch 'master' of https://github.com/XcrossD/RunnerGame

Conflicts:
	Assets/mainscene.unity
Merge branch 'master' of https://github.com/XcrossD/RunnerGame

Conflicts:
	Assets/mainscene.unity
Updated trigger disables & changed crosscut to collider
Merge branch 'master' of https://github.com/XcrossD/RunnerGame

Conflicts:
	Assets/mainscene.unity