add fork, mod random
Merge remote-tracking branch 'origin/master'

Conflicts:
	filling_db/init_db.py