add vim text
(cherry picked from commit 65a525d87ec0868dc8e468a015cd1d8b52bdc0aa)
Merge branch 'a_test'
yo
add git attributes