Fix merge conflict in denoisingsimp_2_linear
Update notebook
Fix introduction_3_image
Fix optimaltransp_5
Fix wavelet_4
Merge pull request #21 from blink1073/master

Fix Merge Errors from Previous PR