Fix fill_db and shit
Merge branch 'master' of github.com:JelteF/bottor