started area triggers JL
started rea triggers JL
Merge branch 'master' of https://github.com/Magicolo/Glimpse

Conflicts:
	Assets/Scenes/Episode 1.unity
rien JL
rien JL
Merge branch 'master' of https://github.com/Magicolo/Glimpse

Conflicts:
	Assets/Scenes/Episode 1.unity
area triggers change the music