minor edits, removed node_modules
added .gitignore
merge diff