Refactored crop and straighten; added attempts at opencv Canny edge detection
Fixing merge conflicts