Merge branch 'master' of C:\wamp\www\melotraxx with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/artiste/profil.php
	assets/css/profila.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/artiste/profil.php
	assets/css/profila.css