add cadre
Merge branch 'tibo'
howler music
Merge branch 'LloydV3'
Merge branch 'KENTIN'

Conflicts:
	src/main.js
	src/models/player.js