To merge
Merge branch 'master' of https://github.com/nbellowe/FlagFinder

Conflicts:
	scripts/tox.ini