Fixed merge conflicts

.gitignore

@@ -8,7 +8,6 @@ startRedis.cmd
 startMongo.cmd
 .database
 dump.rdb
-npm-debug.log
 
 # Back End
 backend/node_modules/
@@ -20,4 +19,4 @@ frontend/build/bundle.js
 frontend/build/config/default.json
 
 npm
-*.log
+*.log