Fixed Bad Merge
Merge branch 'master' of https://github.com/10DaysLeftToLive/TimeWhaleEngine

Conflicts:
	assets/Scenes/FinalLevels/LevelBase.unity