added
Revert "Test marge again"

This reverts commit f3c18483a4e35f5370ef25ecd7229efd9e08d48d.

Conflicts:
	Assets/Scripts/PlayerScript.cs