removing node_modules
updated .gitignore
Merge branch 'master' of github.com:lmccart/fixus