add config.py in gitignore
merge branch