added more info about canny impl to abschlussbericht
fixed merge conflict