Merge pull request #2 from Tzinov15/master

Just 2 sec of work
Merge pull request #3 from Tzinov15/master

Keeping utd.
Merge pull request #8 from Tzinov15/tzinov-d

Tzinov - master merge
Setting up new dependency in ff: pysqlite
Update example_tox.py
Merge pull request #4 from Tzinov15/master

Pull...
Moving stuff around
Merge pull request #12 from nbellowe/master

Moving stuff around.
Delete
Merge pull request #13 from nbellowe/master

Delete
Merge pull request #11 from Tzinov15/jkinnard

Setting up new dependency in ff: pysqlite
edited tox.ini and setup.py location
Changed setup.py location
Merge branch 'master' into jkinnard
Merge branch 'jkinnard'
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