committing sqlalchemy changes
committing sqlalchemy conversion changes
added .idea folder to gitignore
fixing merge conflicts