resolving merge conflict when merging in master
resolving merge conflict when merging in master

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