Add Credits for damien
Proper credits
Merge branch 'tp4-damien' into tp4-tarik
fix merge issues