Commit to merge with head.
Merge branch 'master' of https://github.com/10DaysLeftToLive/TimeWhaleEngine

Conflicts:
	Assets/Scripts/Items/Inventory.cs
	Assets/Scripts/PlayerCharacter/Player.cs
	assets/Scripts/NPC/SpecificNPCs/Sister.cs
Merge branch 'master' of https://github.com/10DaysLeftToLive/TimeWhaleEngine