modified:   .gitignore
deleted:    conf.json