add html snippets for vim
add 'node_modules' to git ignore and vim ignores
Merge remote-tracking branch 'origin/master'