Scene changed a bit.
Merge branch 'master' of https://github.com/ferraguti/Trololo---The-Game

# By ferraguti
# Via ferraguti
* 'master' of https://github.com/ferraguti/Trololo---The-Game:
  Textures and prefabs
  Zen mode and mike input added

Conflicts:
	Assets/scene de merde.unity
Breadcrubs.
Merge branch 'master' of https://github.com/ferraguti/Trololo---The-Game

# By ferraguti
# Via ferraguti
* 'master' of https://github.com/ferraguti/Trololo---The-Game:
  Meta stuff

Conflicts:
	Assets/scene de merde.unity
	ProjectSettings/ProjectSettings.asset
Added some packages, changed player movement a bit.
Merge branch 'master' of https://github.com/ferraguti/Trololo---The-Game

# By ferraguti
# Via ferraguti
* 'master' of https://github.com/ferraguti/Trololo---The-Game:
  Sound stuff

Conflicts:
	Assets/Scripts/Player.cs
	ProjectSettings/TimeManager.asset
Music/Player script merge.