Added database work
Expanded gitignore to python bytecode files, confif files, and sqlite dbs
Resolved merge conflicts