Added lost npm package.json
Refactoring to fix brush issues
Minor changes due to refactoring
Fixed indenting. Minor changes due to refactoring
Changed .gitignore