Update README.md
add vim-indent-guides
update gitignore
Merge branch 'master' into windows