uncommited files
Merge branch 'master' of https://github.com/delvinv/EdgeDetector
making stuff right.