Modify .gitignore
Merge branches