update mineur
Merge branch 'master' of https://github.com/Alexiscap/slyset

Conflicts:
	application/controllers/mc_musique.php
	application/models/musique_model.php
	assets/musique/Helicopter.mp3
correctif
Merge branch 'master' of https://github.com/Alexiscap/slyset