added edge_detection diagram
made changes to tex file
Merge remote-tracking branch 'origin'

Merging in changes that I is behind on