Commit
Merge branch 'testing'
changed .vimrc