fix after merge
Merge branch 'master' of github.com:hashbrowncipher/doppler

Conflicts:
	util.py