update repo
update .gitignore
add vim ctrlp
fix conflict