Added to .gitignore.
Added config.py to .gitignore.
Added to .gitignore to standardize for collaboration.
Fixed conflict.