Initial commit
add vim and bashrc
modified README.md file
delete bashrc
edit vimrc
modified
conflict fixed