?! *grrr
Merge branch 'master' of https://github.com/manuelfehmer/Calli-cv

Conflicts:
	Calli-cv.py