old commit
Merge branch 'master' of github.com:kits89/CVFinalProject

Conflicts:
	segmentation.py