create .vimrc
test configuration
Merge remote-tracking branch 'origin/vimrc'