Refactoring,,,
merge
Extend git ignores