add git
Merge branch 'feature-1' closed #1