foo
Merge branch 'master' of github.com:hanabishi/pythoncam

Conflicts:
	backend/camservice.py