Updated main.py 4:13am

Added our API key
Updates
conflicts