Cool Test
Merge branch 'master' of https://github.com/benj-zen/FPS-One

Conflicts:
	Assets/Scripts/Player.cs
Merge branch 'master' of https://github.com/benj-zen/FPS-One

Conflicts:
	Assets/Resources/Materials/RedCorner.mat