对文件进行了一些整理
git的配置文件
Merge branch 'master' of https://github.com/JoeXie/EdgeDetection

Conflicts:
	.gitignore
梳理了程序，增加部分注释
Merge branch 'master' of https://github.com/JoeXie/EdgeDetection