fix merge issues
fix merge issues

alicoding/nimble,pratts/brackets,GHackAnonymous/brackets,gwynndesign/brackets,brianjking/brackets,sedge/nimble,StephanieMak/brackets,hanmichael/brackets,wesleifreitas/brackets,keir-rex/brackets,uwsd/brackets,busykai/brackets,SidBala/brackets,eric-stanley/brackets,youprofit/brackets,ricciozhang/brackets,FTG-003/brackets,karevn/brackets,dtcom/MyPSDBracket,Denisov21/brackets,sophiacaspar/brackets,goldcase/brackets,resir014/brackets,quasto/ArduinoStudio,srinivashappy/brackets,malinkie/brackets,jacobnash/brackets,zaggino/brackets-electron,simon66/brackets,ls2uper/brackets,NGHGithub/brackets,pkdevbox/brackets,hanmichael/brackets,fcjailybo/brackets,ricciozhang/brackets,tan9/brackets,82488059/brackets,MantisWare/brackets,mcanthony/brackets,bidle/brackets,CoherentLabs/brackets,stowball/brackets,RobertJGabriel/brackets,Real-Currents/brackets,zaggino/brackets-electron,alexkid64/brackets,dtcom/MyPSDBracket,Real-Currents/brackets,keir-rex/brackets,richmondgozarin/brackets,Th30/brackets,zhukaixy/brackets,Andrey-Pavlov/brackets,chrismoulton/brackets,brianjking/brackets,chambej/brackets,show0017/brackets,fcjailybo/brackets,ralic/brackets,nucliweb/brackets,ggusman/present,ashleygwilliams/brackets,richmondgozarin/brackets,ChaofengZhou/brackets,baig/brackets,sgupta7857/brackets,goldcase/brackets,baig/brackets,Wikunia/brackets,dangkhue27/brackets,TylerL-uxai/brackets,ScalaInc/brackets,rlugojr/brackets,lunode/brackets,Rajat-dhyani/brackets,abhisekp/brackets,GHackAnonymous/brackets,Free-Technology-Guild/brackets,Mosoc/brackets,Live4Code/brackets,goldcase/brackets,jmarkina/brackets,wesleifreitas/brackets,NickersF/brackets,fabricadeaplicativos/brackets,karevn/brackets,agreco/brackets,SebastianBoyd/sebastianboyd.github.io-OLD,petetnt/brackets,lunode/brackets,NickersF/brackets,xantage/brackets,thehogfather/brackets,gcommetti/brackets,wangjun/brackets,rafaelstz/brackets,fvntr/brackets,marcominetti/brackets,dangkhue27/brackets,GHackAnonymous/brackets,humphd/brackets,raygervais/brackets,resir014/brackets,fronzec/brackets,ecwebservices/brackets,mozilla/brackets,kilroy23/brackets,srhbinion/brackets,revi/brackets,petetnt/brackets,amrelnaggar/brackets,sgupta7857/brackets,No9/brackets,kolipka/brackets,falcon1812/brackets,simon66/brackets,jacobnash/brackets,MahadevanSrinivasan/brackets,Fcmam5/brackets,riselabs-ufba/RiPLE-HC-ExperimentalData,tan9/brackets,chambej/brackets,y12uc231/brackets,L0g1k/quickfire-old,RobertJGabriel/brackets,chinnyannieb/brackets,MahadevanSrinivasan/brackets,RamirezWillow/brackets,riselabs-ufba/RiPLE-HC-ExperimentalData,richmondgozarin/brackets,mozilla/brackets,mat-mcloughlin/brackets,ashleygwilliams/brackets,MantisWare/brackets,fronzec/brackets,siddharta1337/brackets,cdot-brackets-extensions/nimble-htmlLint,jmarkina/brackets,ryanackley/tailor,Pomax/brackets,L0g1k/quickfire-old,Free-Technology-Guild/brackets,Rynaro/brackets,ForkedRepos/brackets,jacobnash/brackets,NGHGithub/brackets,hanmichael/brackets,StephanieMak/brackets,mat-mcloughlin/brackets,fvntr/brackets,fastrde/brackets,thehogfather/brackets,No9/brackets,Mosoc/brackets,82488059/brackets,jmarkina/brackets,chinnyannieb/brackets,jiawenbo/brackets,SebastianBoyd/sebastianboyd.github.io-OLD,gwynndesign/brackets,rlugojr/brackets,andrewnc/brackets,CapeSepias/brackets,wangjun/brackets,adrianhartanto0/brackets,treejames/brackets,siddharta1337/brackets,andrewnc/brackets,IAmAnubhavSaini/brackets,busykai/brackets,lovewitty/brackets,andrewnc/brackets,jiimaho/brackets,Lojsan123/brackets,lovewitty/brackets,arduino-org/ArduinoStudio,michaeljayt/brackets,NickersF/brackets,iamchathu/brackets,richmondgozarin/brackets,ecwebservices/brackets,thr0w/brackets,ryanackley/tailor,StephanieMak/brackets,Lojsan123/brackets,uwsd/brackets,ficristo/brackets,kolipka/brackets,veveykocute/brackets,wakermahmud/brackets,Pomax/brackets,malinkie/brackets,MahadevanSrinivasan/brackets,L0g1k/quickfire-old,karevn/brackets,NGHGithub/brackets,JordanTheriault/brackets,CoherentLabs/brackets,show0017/brackets,shal1y/brackets,CapeSepias/brackets,MarcelGerber/brackets,Jonavin/brackets,fashionsun/brackets,gupta-tarun/brackets,adobe/brackets,kilroy23/brackets,ryanackley/tailor,robertkarlsson/brackets,2youyouo2/cocoslite,StephanieMak/brackets,nucliweb/brackets,zhukaixy/brackets,thehogfather/brackets,m66n/brackets,chrisle/brackets,mcanthony/brackets,SebastianBoyd/sebastianboyd.github.io-OLD,weebygames/brackets,82488059/brackets,marcominetti/brackets,phillipalexander/brackets,m66n/brackets,ForkedRepos/brackets,robertkarlsson/brackets,Cartman0/brackets,MahadevanSrinivasan/brackets,flukeout/brackets,fabricadeaplicativos/brackets,youprofit/brackets,flukeout/brackets,cdot-brackets-extensions/nimble-htmlLint,petetnt/brackets,kolipka/brackets,Mosoc/brackets,lunode/brackets,zLeonjo/brackets,busykai/brackets,pratts/brackets,wangjun/brackets,gupta-tarun/brackets,sprintr/brackets,pomadgw/brackets,emanziano/brackets,siddharta1337/brackets,L0g1k/brackets,adrianhartanto0/brackets,alexkid64/brackets,rafaelstz/brackets,mozilla/brackets,chambej/brackets,nucliweb/brackets,sophiacaspar/brackets,xantage/brackets,rlugojr/brackets,MarcelGerber/brackets,2youyouo2/cocoslite,xantage/brackets,SidBala/brackets,sedge/nimble,rafaelstz/brackets,abhisekp/brackets,fastrde/brackets,mjurczyk/brackets,JordanTheriault/brackets,Fcmam5/brackets,ggusman/present,brianjking/brackets,riselabs-ufba/RiPLE-HC-ExperimentalData,zLeonjo/brackets,CapeSepias/brackets,zcbenz/brackets,massimiliano76/brackets,macdg/brackets,humphd/brackets,ggusman/present,zaggino/brackets-electron,sophiacaspar/brackets,Pomax/brackets,massimiliano76/brackets,fashionsun/brackets,massimiliano76/brackets,bidle/brackets,pratts/brackets,ForkedRepos/brackets,mjurczyk/brackets,Denisov21/brackets,gcommetti/brackets,revi/brackets,nucliweb/brackets,lunode/brackets,ScalaInc/brackets,treejames/brackets,adobe/brackets,2youyouo2/cocoslite,sedge/nimble,mcanthony/brackets,weebygames/brackets,TylerL-uxai/brackets,andrewnc/brackets,fashionsun/brackets,stowball/brackets,ricciozhang/brackets,MahadevanSrinivasan/brackets,Mosoc/brackets,Denisov21/brackets,RobertJGabriel/brackets,fvntr/brackets,robertkarlsson/brackets,Live4Code/brackets,sedge/nimble,zLeonjo/brackets,shiyamkumar/brackets,gcommetti/brackets,IAmAnubhavSaini/brackets,NKcentinel/brackets,baig/brackets,NickersF/brackets,Cartman0/brackets,bidle/brackets,ropik/brackets,SidBala/brackets,adobe/brackets,sophiacaspar/brackets,sgupta7857/brackets,stowball/brackets,jiawenbo/brackets,weebygames/brackets,Free-Technology-Guild/brackets,phillipalexander/brackets,chinnyannieb/brackets,Wikunia/brackets,uwsd/brackets,Denisov21/brackets,chrismoulton/brackets,ChaofengZhou/brackets,thehogfather/brackets,netlams/brackets,robertkarlsson/brackets,ls2uper/brackets,ecwebservices/brackets,alicoding/nimble,macdg/brackets,NKcentinel/brackets,netlams/brackets,pratts/brackets,Live4Code/brackets,phillipalexander/brackets,Pomax/brackets,82488059/brackets,Andrey-Pavlov/brackets,emanziano/brackets,raygervais/brackets,dtcom/MyPSDBracket,Wikunia/brackets,jacobnash/brackets,hanmichael/brackets,iamchathu/brackets,RamirezWillow/brackets,zLeonjo/brackets,uwsd/brackets,kilroy23/brackets,michaeljayt/brackets,arduino-org/ArduinoStudio,robertkarlsson/brackets,fcjailybo/brackets,ricciozhang/brackets,Rajat-dhyani/brackets,lovewitty/brackets,JordanTheriault/brackets,MantisWare/brackets,siddharta1337/brackets,fronzec/brackets,srinivashappy/brackets,Jonavin/brackets,ralic/brackets,Real-Currents/brackets,shal1y/brackets,alexkid64/brackets,chrismoulton/brackets,massimiliano76/brackets,ryanackley/tailor,Lojsan123/brackets,kilroy23/brackets,emanziano/brackets,veveykocute/brackets,wakermahmud/brackets,CapeSepias/brackets,gideonthomas/brackets,ScalaInc/brackets,baig/brackets,wakermahmud/brackets,gupta-tarun/brackets,JordanTheriault/brackets,L0g1k/brackets,ralic/brackets,TylerL-uxai/brackets,ashleygwilliams/brackets,shiyamkumar/brackets,No9/brackets,zcbenz/brackets,thr0w/brackets,kolipka/brackets,ropik/brackets,Lojsan123/brackets,humphd/brackets,goldcase/brackets,Th30/brackets,fvntr/brackets,ashleygwilliams/brackets,mozilla/brackets,Real-Currents/brackets,ggusman/present,resir014/brackets,ls2uper/brackets,petetnt/brackets,rlugojr/brackets,massimiliano76/brackets,chrismoulton/brackets,amrelnaggar/brackets,rafaelstz/brackets,Jonavin/brackets,wesleifreitas/brackets,NGHGithub/brackets,fronzec/brackets,uwsd/brackets,Pomax/brackets,mjurczyk/brackets,dangkhue27/brackets,FTG-003/brackets,stowball/brackets,quasto/ArduinoStudio,zhukaixy/brackets,Jonavin/brackets,stowball/brackets,Rajat-dhyani/brackets,fronzec/brackets,ChaofengZhou/brackets,quasto/ArduinoStudio,ecwebservices/brackets,cosmosgenius/brackets,agreco/brackets,petetnt/brackets,macdg/brackets,chrisle/brackets,treejames/brackets,iamchathu/brackets,ecwebservices/brackets,srhbinion/brackets,ficristo/brackets,fashionsun/brackets,FTG-003/brackets,albertinad/brackets,Cartman0/brackets,arduino-org/ArduinoStudio,keir-rex/brackets,michaeljayt/brackets,amrelnaggar/brackets,cdot-brackets-extensions/nimble-htmlLint,lovewitty/brackets,raygervais/brackets,ls2uper/brackets,TylerL-uxai/brackets,NKcentinel/brackets,zaggino/brackets-electron,hanmichael/brackets,y12uc231/brackets,fvntr/brackets,ropik/brackets,kolipka/brackets,MantisWare/brackets,zLeonjo/brackets,mozilla/brackets,sprintr/brackets,ls2uper/brackets,gwynndesign/brackets,pkdevbox/brackets,phillipalexander/brackets,L0g1k/quickfire-old,wesleifreitas/brackets,Jonavin/brackets,iamchathu/brackets,keir-rex/brackets,show0017/brackets,shiyamkumar/brackets,gideonthomas/brackets,Rajat-dhyani/brackets,No9/brackets,malinkie/brackets,siddharta1337/brackets,mjurczyk/brackets,udhayam/brackets,goldcase/brackets,eric-stanley/brackets,fashionsun/brackets,Fcmam5/brackets,riselabs-ufba/RiPLE-HC-ExperimentalData,jiimaho/brackets,eric-stanley/brackets,adobe/brackets,chrisle/brackets,Rynaro/brackets,wangjun/brackets,m66n/brackets,y12uc231/brackets,flukeout/brackets,richmondgozarin/brackets,pomadgw/brackets,srhbinion/brackets,Rynaro/brackets,riselabs-ufba/RiPLE-HC-ExperimentalData,flukeout/brackets,amrelnaggar/brackets,brianjking/brackets,ChaofengZhou/brackets,brianjking/brackets,alexkid64/brackets,mat-mcloughlin/brackets,SebastianBoyd/sebastianboyd.github.io-OLD,RamirezWillow/brackets,agreco/brackets,tan9/brackets,2youyouo2/cocoslite,m66n/brackets,zaggino/brackets-electron,GHackAnonymous/brackets,veveykocute/brackets,y12uc231/brackets,NKcentinel/brackets,eric-stanley/brackets,ricciozhang/brackets,falcon1812/brackets,chrisle/brackets,IAmAnubhavSaini/brackets,abhishekbhalani/brackets,netlams/brackets,revi/brackets,sedge/nimble,NickersF/brackets,Andrey-Pavlov/brackets,fastrde/brackets,fcjailybo/brackets,Rajat-dhyani/brackets,veveykocute/brackets,abhisekp/brackets,Denisov21/brackets,sprintr/brackets,xantage/brackets,TylerL-uxai/brackets,mjurczyk/brackets,raygervais/brackets,youprofit/brackets,fcjailybo/brackets,shiyamkumar/brackets,Rynaro/brackets,shiyamkumar/brackets,Th30/brackets,jacobnash/brackets,albertinad/brackets,netlams/brackets,abhisekp/brackets,Andrey-Pavlov/brackets,jiawenbo/brackets,jmarkina/brackets,malinkie/brackets,thr0w/brackets,sprintr/brackets,humphd/brackets,srhbinion/brackets,busykai/brackets,IAmAnubhavSaini/brackets,adrianhartanto0/brackets,Cartman0/brackets,ashleygwilliams/brackets,amrelnaggar/brackets,eric-stanley/brackets,Cartman0/brackets,L0g1k/brackets,lunode/brackets,jiimaho/brackets,cosmosgenius/brackets,Andrey-Pavlov/brackets,MarcelGerber/brackets,thr0w/brackets,michaeljayt/brackets,veveykocute/brackets,wesleifreitas/brackets,srinivashappy/brackets,gideonthomas/brackets,treejames/brackets,jiawenbo/brackets,shal1y/brackets,pomadgw/brackets,fabricadeaplicativos/brackets,wakermahmud/brackets,y12uc231/brackets,Wikunia/brackets,udhayam/brackets,abhisekp/brackets,ralic/brackets,CoherentLabs/brackets,quasto/ArduinoStudio,karevn/brackets,thr0w/brackets,dtcom/MyPSDBracket,ForkedRepos/brackets,andrewnc/brackets,gcommetti/brackets,arduino-org/ArduinoStudio,ScalaInc/brackets,agreco/brackets,IAmAnubhavSaini/brackets,m66n/brackets,falcon1812/brackets,mat-mcloughlin/brackets,simon66/brackets,jiimaho/brackets,ficristo/brackets,udhayam/brackets,zcbenz/brackets,ForkedRepos/brackets,zaggino/brackets-electron,alicoding/nimble,pkdevbox/brackets,phillipalexander/brackets,CapeSepias/brackets,NGHGithub/brackets,ChaofengZhou/brackets,chinnyannieb/brackets,2youyouo2/cocoslite,treejames/brackets,keir-rex/brackets,CoherentLabs/brackets,lovewitty/brackets,falcon1812/brackets,MantisWare/brackets,FTG-003/brackets,emanziano/brackets,MarcelGerber/brackets,shal1y/brackets,alexkid64/brackets,albertinad/brackets,simon66/brackets,pkdevbox/brackets,srinivashappy/brackets,chambej/brackets,adrianhartanto0/brackets,FTG-003/brackets,emanziano/brackets,ficristo/brackets,sprintr/brackets,JordanTheriault/brackets,wakermahmud/brackets,ficristo/brackets,pomadgw/brackets,Fcmam5/brackets,Mosoc/brackets,GHackAnonymous/brackets,rlugojr/brackets,pratts/brackets,tan9/brackets,humphd/brackets,RobertJGabriel/brackets,karevn/brackets,Live4Code/brackets,revi/brackets,L0g1k/quickfire-old,weebygames/brackets,Free-Technology-Guild/brackets,Lojsan123/brackets,No9/brackets,abhishekbhalani/brackets,flukeout/brackets,SidBala/brackets,gupta-tarun/brackets,riselabs-ufba/RiPLE-HC-ExperimentalData,pomadgw/brackets,ralic/brackets,sgupta7857/brackets,netlams/brackets,RobertJGabriel/brackets,chrisle/brackets,Live4Code/brackets,gideonthomas/brackets,resir014/brackets,Th30/brackets,bidle/brackets,Th30/brackets,bidle/brackets,xantage/brackets,RamirezWillow/brackets,malinkie/brackets,jmarkina/brackets,macdg/brackets,mcanthony/brackets,dangkhue27/brackets,chambej/brackets,dangkhue27/brackets,adobe/brackets,busykai/brackets,ScalaInc/brackets,NKcentinel/brackets,quasto/ArduinoStudio,zhukaixy/brackets,fabricadeaplicativos/brackets,albertinad/brackets,abhishekbhalani/brackets,wangjun/brackets,pkdevbox/brackets,cosmosgenius/brackets,falcon1812/brackets,Real-Currents/brackets,raygervais/brackets,show0017/brackets,baig/brackets,youprofit/brackets,chinnyannieb/brackets,jiawenbo/brackets,SebastianBoyd/sebastianboyd.github.io-OLD,gcommetti/brackets,ropik/brackets,rafaelstz/brackets,tan9/brackets,chrismoulton/brackets,arduino-org/ArduinoStudio,weebygames/brackets,kilroy23/brackets,cosmosgenius/brackets,sgupta7857/brackets,iamchathu/brackets,zhukaixy/brackets,Fcmam5/brackets,alicoding/nimble,cdot-brackets-extensions/nimble-htmlLint,Free-Technology-Guild/brackets,srinivashappy/brackets,jiimaho/brackets,thehogfather/brackets,gwynndesign/brackets,gupta-tarun/brackets,Wikunia/brackets,macdg/brackets,sophiacaspar/brackets,shal1y/brackets,udhayam/brackets,nucliweb/brackets,revi/brackets,udhayam/brackets,michaeljayt/brackets,adrianhartanto0/brackets,resir014/brackets,albertinad/brackets,mcanthony/brackets,SidBala/brackets,Real-Currents/brackets,82488059/brackets,fabricadeaplicativos/brackets,gideonthomas/brackets,StephanieMak/brackets,zcbenz/brackets,Rynaro/brackets,srhbinion/brackets,fastrde/brackets,simon66/brackets,MarcelGerber/brackets,RamirezWillow/brackets,youprofit/brackets,L0g1k/brackets,fastrde/brackets