Tox
Merge branch 'master' of github.com:Kozea/brigit

Conflicts:
	tox.ini