Modified Database.py, pre-install.sh, data.db
Merged