add vimrc
Merge branch 'dev'