slight changes
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
added canny edge
Merge pull request #60 from Callum-/master

updated dilatometer