fixed conflict in package.json
fixed conflict in package.json

rtang03/fabric-seed,alexmanning23/uafl-web,fr-esco/angular-seed,chnoumis/angular2-seed-advanced,zertyz/angular-seed-advanced-spikes,tobiaseisenschenk/data-cube,idready/Philosophers,m-abs/angular2-seed-advanced,zertyz/edificando-o-controle-interno,davewragg/agot-spa,rtang03/fabric-seed,fart-one/monitor-ngx,pieczkus/whyblogfront,natarajanmca11/angular2-seed,OlivierVoyer/angular-seed-advanced,pocmanu/angular2-seed-advanced,christophersanson/js-demo-fe,sanastasiadis/angular-seed-openlayers,arun-awnics/mesomeds-ng2,trutoo/startatalk-native,maniche04/ngIntranet,NathanWalker/angular2-seed-advanced,JohnnyQQQQ/angular-seed-material2,davewragg/agot-spa,arun-awnics/mesomeds-ng2,zertyz/observatorio-SUAS-formularios,wenzelj/nativescript-angular,idready/Philosophers,hookom/climbontheway,dmitriyse/angular2-seed,hookom/climbontheway,idready/Bloody-Prophety-NG2,vyakymenko/angular-seed-express,dmitriyse/angular2-seed,tctc91/angular2-wordpress-portfolio,ysyun/angular-seed-stub-api-environment,pocmanu/angular2-seed-advanced,tctc91/angular2-wordpress-portfolio,tiagomapmarques/angular-examples_books,guilhebl/offer-web,maniche04/ngIntranet,sylviefiat/bdmer3,christophersanson/js-demo-fe,pocmanu/angular2-seed-advanced,talentspear/a2-redux,lhoezee/faithreg1,NathanWalker/angular-seed-advanced,vyakymenko/angular-seed-express,fart-one/monitor-ngx,GeoscienceAustralia/gnss-site-manager,MgCoders/angular-seed,miltador/unichat,miltador/unichat,ilvestoomas/angular-seed-advanced,jelgar1/fpl-api,NathanWalker/angular-seed-advanced,rtang03/fabric-seed,zertyz/angular-seed-advanced-spikes,tctc91/angular2-wordpress-portfolio,watonyweng/angular-seed,llwt/angular-seed-advanced,deanQj/angular2-seed-bric,Shyiy/angular-seed,GeoscienceAustralia/gnss-site-manager,adobley/angular2-tdd-workshop,idready/Bloody-Prophety-NG2,Sn3b/angular-seed-advanced,nie-ine/raeber-website,mgechev/angular-seed,dmitriyse/angular2-seed,tobiaseisenschenk/data-cube,Shyiy/angular-seed,radiorabe/raar-ui,origamyllc/Mangular,AnnaCasper/finance-tool,JohnnyQQQQ/md-dashboard,jigarpt/angular-seed-semi,Jimmysh/angular2-seed-advanced,rawnics/mesomeds-ng2,ysyun/angular-seed-stub-api-environment,tiagomapmarques/angular-examples_books,hookom/climbontheway,miltador/unichat,zertyz/angular-seed-advanced-spikes,OlivierVoyer/angular-seed-advanced,JohnnyQQQQ/md-dashboard,maniche04/ngIntranet,sylviefiat/bdmer3,ppanthony/angular-seed-tutorial,NathanWalker/angular-seed-advanced,pratheekhegde/a2-redux,fr-esco/angular-seed,adobley/angular2-tdd-workshop,adobley/angular2-tdd-workshop,prabhatsharma/bwa2,radiorabe/raar-ui,shaggyshelar/Linkup,idready/Bloody-Prophety-NG2,wenzelj/nativescript-angular,idready/Philosophers,radiorabe/raar-ui,ManasviA/Dashboard,mgechev/angular2-seed,prabhatsharma/bwa2,nie-ine/raeber-website,Karasuni/angular-seed,AWNICS/mesomeds-ng2,Sn3b/angular-seed-advanced,ilvestoomas/angular-seed-advanced,ysyun/angular-seed-stub-api-environment,trutoo/startatalk-native,AWNICS/mesomeds-ng2,GeoscienceAustralia/gnss-site-manager,millea1/tips1,Nightapes/angular2-seed,shaggyshelar/Linkup,millea1/tips1,tiagomapmarques/angular-examples_books,AnnaCasper/finance-tool,Jimmysh/angular2-seed-advanced,Shyiy/angular-seed,mgechev/angular2-seed,mgechev/angular-seed,AnnaCasper/finance-tool,shaggyshelar/Linkup,adobley/angular2-tdd-workshop,pratheekhegde/a2-redux,deanQj/angular2-seed-bric,alexmanning23/uafl-web,JohnnyQQQQ/md-dashboard,rtang03/fabric-seed,Jimmysh/angular2-seed-advanced,trutoo/startatalk-native,OlivierVoyer/angular-seed-advanced,Karasuni/angular-seed,pieczkus/whyblogfront,oblong-antelope/oblong-web,felipecamargo/ACSC-SBPL-M,felipecamargo/ACSC-SBPL-M,llwt/angular-seed-advanced,ysyun/angular-seed-stub-api-environment,nickaranz/robinhood-ui,pieczkus/whyblogfront,watonyweng/angular-seed,lhoezee/faithreg1,CNSKnight/angular2-seed-advanced,nickaranz/robinhood-ui,zertyz/edificando-o-controle-interno,sanastasiadis/angular-seed-openlayers,JohnnyQQQQ/angular-seed-material2,Nightapes/angular2-seed,talentspear/a2-redux,davewragg/agot-spa,jigarpt/angular-seed-semi,rawnics/mesomeds-ng2,zertyz/observatorio-SUAS,lhoezee/faithreg1,dmitriyse/angular2-seed,Karasuni/angular-seed,m-abs/angular2-seed-advanced,zertyz/observatorio-SUAS,ManasviA/Dashboard,guilhebl/offer-web,Sn3b/angular-seed-advanced,felipecamargo/ACSC-SBPL-M,radiorabe/raar-ui,zertyz/observatorio-SUAS,wenzelj/nativescript-angular,nie-ine/raeber-website,ppanthony/angular-seed-tutorial,ppanthony/angular-seed-tutorial,natarajanmca11/angular2-seed,ManasviA/Dashboard,ronikurnia1/ClientApp,MgCoders/angular-seed,fr-esco/angular-seed,mgechev/angular-seed,natarajanmca11/angular2-seed,NathanWalker/angular2-seed-advanced,jelgar1/fpl-api,sylviefiat/bdmer3,guilhebl/offer-web,ManasviA/Dashboard,pratheekhegde/a2-redux,chnoumis/angular2-seed-advanced,oblong-antelope/oblong-web,prabhatsharma/bwa2,ronikurnia1/ClientApp,tobiaseisenschenk/data-cube,jigarpt/angular-seed-semi,NathanWalker/angular2-seed-advanced,christophersanson/js-demo-fe,zertyz/observatorio-SUAS-formularios,Nightapes/angular2-seed,ilvestoomas/angular-seed-advanced,CNSKnight/angular2-seed-advanced,sanastasiadis/angular-seed-openlayers,origamyllc/Mangular,hookom/climbontheway,llwt/angular-seed-advanced,oblong-antelope/oblong-web,nie-ine/raeber-website,m-abs/angular2-seed-advanced,AWNICS/mesomeds-ng2,talentspear/a2-redux,arun-awnics/mesomeds-ng2,CNSKnight/angular2-seed-advanced,fart-one/monitor-ngx,zertyz/edificando-o-controle-interno,ronikurnia1/ClientApp,nickaranz/robinhood-ui,mgechev/angular2-seed,MgCoders/angular-seed,chnoumis/angular2-seed-advanced,OlivierVoyer/angular-seed-advanced,MgCoders/angular-seed,alexmanning23/uafl-web,jelgar1/fpl-api,JohnnyQQQQ/angular-seed-material2,zertyz/observatorio-SUAS-formularios,origamyllc/Mangular,rawnics/mesomeds-ng2,rtang03/fabric-seed,zertyz/observatorio-SUAS,millea1/tips1,deanQj/angular2-seed-bric,vyakymenko/angular-seed-express