Merge branch 'master' of https://github.com/Deuces/Hackaton

Conflicts:
	fillDB.py
gitignore