No moar dancing hair
Merge branch 'master' of https://github.com/10DaysLeftToLive/TimeWhaleEngine

Conflicts:
	assets/Resources/apple.prefab
	assets/Resources/seeds.prefab
	assets/Resources/toolbox.prefab
	assets/art/characters/Fortuneteller/Fortuneteller.asset