some work...
Merge branch 'master' of github.com:andiwand/picamera-server-python

Conflicts:
	util.py