Deleting node_modules, you'll have to npm install again. Don't push your node_modules!
yMerge branch 'master' of https://github.com/madisonmay13/Take5-Server