add compile from input
fix merge conflict
Merge branch 'master' of https://github.com/liwenxiang/vimrc
add myself vimrc
merge finish