no message
Merge branch 'master' of https://github.com/Percyvalle/TESTER

Conflicts:
	Eternal lullaby/Eternal Lullaby Awakening/Assets/Scenes/Bedroom(Babies).unity
	Eternal lullaby/Eternal Lullaby Awakening/Assets/Scenes/Bedroom.unity
	Eternal lullaby/Eternal Lullaby Awakening/Assets/Scenes/Diningroom.unity
	Eternal lullaby/Eternal Lullaby Awakening/Assets/Standard Assets/Water (Pro Only)/Sources/Materials/Daylight Water.mat
	Eternal lullaby/Eternal Lullaby Awakening/ProjectSettings/QualitySettings.asset