merging
fixed merge issue
adding td4 francois
final repport for tp3