xx
q
Merge branch 'master' of https://github.com/amgaa/powerctl

Conflicts:
	gsub.pyc
	mctl.pyc
	pctl.pyc
	trqctl.pyc
dd