adding gitignore and updating twitter with credentials
server.py
merge conflict fix
ignore libs
import sqlalchemy stuff
another merge conflict