created new db.sqlite3 and put dj_database_url in settings properly
adding gitignore
fixed merge conflicts