fixed merge conflict with gitignore
fixed merge conflict with gitignore

mattfili/Northwind-Angular-Postgres,mattfili/Angular-Foundation-Mongo-Express-Boilerplate,mattfili/capstonerevamped,mattfili/node-postgres-testing,mattfili/capstonerevamped,mattfili/Northwind-Angular-Postgres,calebgregory/Northwind-Angular-Postgres,mattfili/Angular-Foundation-Mongo-Express-Boilerplate,ChelseaBurns/Northwind-Angular-Postgres,calebgregory/Northwind-Angular-Postgres,jybjones/Northwind-Angular-Postgres,jybjones/Northwind-Angular-Postgres,ChelseaBurns/Northwind-Angular-Postgres,mattfili/node-postgres-testing