Merge gitignore with master