Add exercise 3 TIADWI
Try to fix merge errors
Try to fix merge errors