Adding files
Merge branch 'master' of https://github.com/zjost/ellipse-detection

Conflicts:
	README.md

commit 2