References created, and tests
removed database file
fixed merge conflict with spacing