edit
Merge branch 'master' of https://github.com/spriver/transparentor

Conflicts:
	TODO