To merge
Merge pull request #5 from Tzinov15/master

Pull quick
Merge branch 'master' of https://github.com/nbellowe/FlagFinder

Conflicts:
	scripts/tox.ini
Merging
Merge pull request #14 from nbellowe/master

Quick merge
Merge pull request #15 from nbellowe/master

Merging