added database access. Includes database interface file, make and test files, and implementing the database functions in server.py where needed
fixed merge issues