Some changes
Merge branch 'master' of https://github.com/SalSatSat/Kitchen-Wrath

Conflicts:
	Assets/Prefabs/Character/Player.prefab
Merge branch 'master' of https://github.com/SalSatSat/Kitchen-Wrath