merge settings conflicts
merge settings conflicts

colin-marshall/foundation-sites,MarcGuay/foundation,atmmarketing/foundation-sites,celsoyh/foundation,zurb/foundation,RichardLee1978/foundation,designerno1/foundation-sites,socketz/foundation-multilevel-offcanvas,jamesstoneco/foundation-sites,socketz/foundation-multilevel-offcanvas,marcosvicente/foundation,mbencharrada/foundation,aoimedia/foundation,djlotus/foundation,natewiebe13/foundation-sites,leo-guinan/foundation,Larzans/foundation,sitexa/foundation,jxnblk/foundation,JihemC/Foundation-Demo,signal/foundation,elkingtonmcb/foundation,barnyp/foundation,r14r-work/fork_foundation_master,glunco/foundation,sashaegorov/foundation-sites,r14r/fork_foundation_master,Iamronan/foundation,adstyles/foundation,pwnall/foundation-sites,iwikmu/foundation,glunco/foundation,lizzwestman/foundation,andycochran/foundation-sites,celsoyh/foundation,pdeffendol/foundation,vrkansagara/foundation,PassKitInc/foundation-sites,r14r/fork_foundation_master,socketz/foundation-multilevel-offcanvas,themccallister/foundation,vita10gy/foundation,dragthor/foundation-sites,ysalmin/foundation,vita10gy/foundation,elkingtonmcb/foundation,Mango-information-systems/foundation,denisahac/foundation-sites,Klaudit/foundation,r14r-work/fork_foundation_master,zurb/foundation-sites,RichardLee1978/foundation,stanwmusic/foundation,birthdayalex/foundation,marcosvicente/foundation,Owlbertz/foundation,djlotus/foundation,zurb/foundation-sites-6,samuelmc/foundation-sites,oller/foundation,birthdayalex/foundation,elkingtonmcb/foundation,DouglasAllen/css-foundation,hummingbird-me/foundation-sites-6,glizer/foundation,yohio/foundation-sites-6,joe-watkins/foundation,MarcGuay/foundation,sethkane/foundation-sites,getoutfitted/reaction-foundation-theme,BerndtGroup/TBG-foundation-sites,anbestephen/foundation,djlotus/foundation,atmmarketing/foundation-sites,brettsmason/foundation-sites,Owlbertz/foundation,getoutfitted/reaction-foundation-theme,pauleds/foundation,mbarlock/foundation,adstyles/foundation,lizzwestman/foundation,andycochran/foundation-sites,jaylensoeur/foundation-sites-6,claytonrodgers/foundation,sashaegorov/foundation-sites,signal/foundation,brettsmason/foundation-sites,pauleds/foundation,Klaudit/foundation,carey/foundation,Teino1978-Corp/Teino1978-Corp-foundation,andycochran/foundation-sites,walbo/foundation,NeonWilderness/foundation,vrkansagara/foundation,asommer70/foundation,jamesstoneco/foundation-sites,pauleds/foundation,vita10gy/foundation,glizer/foundation,jlegendary/foundation,ioanok/foundation,NeonWilderness/foundation,gnepal7/foundation,glizer/foundation,mbencharrada/foundation,walbo/foundation,jaylensoeur/foundation-sites-6,vrkansagara/foundation,celsoyh/foundation,labr1005/foundation,pdeffendol/foundation,oller/foundation,NeonWilderness/foundation,stanwmusic/foundation,Iamronan/foundation,jaylensoeur/foundation-sites-6,stanwmusic/foundation,MarcGuay/foundation,JihemC/Foundation-Demo,karland/foundation-sites,dragthor/foundation-sites,ibroadfo/foundation,ysalmin/foundation,birthdayalex/foundation,birthdayalex/foundation,pwnall/foundation-sites,claytonrodgers/foundation,NeonWilderness/foundation,colin-marshall/foundation-sites,leo-guinan/foundation,aoimedia/foundation,IamManchanda/foundation-sites,DaSchTour/foundation-sites,JihemC/Foundation-Demo,PassKitInc/foundation-sites,sethkane/foundation-sites,joe-watkins/foundation,dimamedia/foundation-6-sites-simple-scss-and-js,denisahac/foundation-sites,wikieswan/foundation,mbarlock/foundation,ioanok/foundation,glunco/foundation,jlegendary/foundation,youprofit/foundation,robottomw/foundation,jxnblk/foundation,leo-guinan/foundation,jlegendary/foundation,youprofit/foundation,pwnall/foundation-sites,jeromelebleu/foundation-sites,RichardLee1978/foundation,DouglasAllen/css-foundation,Klaudit/foundation,pdeffendol/foundation,Mango-information-systems/foundation,robottomw/foundation,zurb/foundation-sites,MarcGuay/foundation,zurb/foundation-sites-6,mbencharrada/foundation,iwikmu/foundation,Larzans/foundation,a-dg/foundation,yohio/foundation-sites-6,JihemC/Foundation-Demo,RichardLee1978/foundation,claytonrodgers/foundation,ucla/foundation-sites,Owlbertz/foundation,hummingbird-me/foundation-sites-6,labr1005/foundation,gnepal7/foundation,ysalmin/foundation,jxnblk/foundation,ucla/foundation-sites,samuelmc/foundation-sites,robottomw/foundation,jxnblk/foundation,laantorchaweb/foundation,glunco/foundation,pauleds/foundation,designerno1/foundation-sites,jlegendary/foundation,Iamronan/foundation,Teino1978-Corp/Teino1978-Corp-foundation,abdullahsalem/foundation-sites,DaSchTour/foundation-sites,DouglasAllen/css-foundation,atmmarketing/foundation-sites,gnepal7/foundation,jamesstoneco/foundation-sites,labr1005/foundation,carey/foundation,iwikmu/foundation,vita10gy/foundation,glizer/foundation,adstyles/foundation,advisorwebsites/foundation-sites-6,DouglasAllen/css-foundation,carey/foundation,natewiebe13/foundation-sites,themccallister/foundation,designerno1/foundation-sites,dimamedia/foundation-6-sites-simple-scss-and-js,mbarlock/foundation,wikieswan/foundation,labr1005/foundation,walbo/foundation,sitexa/foundation,signal/foundation,mbarlock/foundation,aoimedia/foundation,asommer70/foundation,youprofit/foundation,ioanok/foundation,anbestephen/foundation,youprofit/foundation,abdullahsalem/foundation-sites,zurb/foundation,Mango-information-systems/foundation,a-dg/foundation,r14r/fork_foundation_master,abdullahsalem/foundation-sites,karland/foundation-sites,ibroadfo/foundation,getoutfitted/reaction-foundation-theme,zurb/foundation-sites,oller/foundation,robottomw/foundation,asommer70/foundation,advisorwebsites/foundation-sites-6,r14r-work/fork_foundation_master,marcosvicente/foundation,carey/foundation,celsoyh/foundation,karland/foundation-sites,ucla/foundation-sites,r14r-work/fork_foundation_master,joe-watkins/foundation,a-dg/foundation,themccallister/foundation,laantorchaweb/foundation,gnepal7/foundation,marcosvicente/foundation,pdeffendol/foundation,signal/foundation,Teino1978-Corp/Teino1978-Corp-foundation,laantorchaweb/foundation,IamManchanda/foundation-sites,anbestephen/foundation,elkingtonmcb/foundation,jeromelebleu/foundation-sites,joe-watkins/foundation,lizzwestman/foundation,barnyp/foundation,mbencharrada/foundation,ibroadfo/foundation,BerndtGroup/TBG-foundation-sites,sashaegorov/foundation-sites,zurb/foundation,sitexa/foundation,sethkane/foundation-sites,walbo/foundation,IamManchanda/foundation-sites,anbestephen/foundation,iwikmu/foundation,barnyp/foundation,vrkansagara/foundation,PassKitInc/foundation-sites,barnyp/foundation,djlotus/foundation,colin-marshall/foundation-sites,Larzans/foundation,natewiebe13/foundation-sites,wikieswan/foundation,brettsmason/foundation-sites,ibroadfo/foundation,BerndtGroup/TBG-foundation-sites,Klaudit/foundation,r14r/fork_foundation_master,denisahac/foundation-sites,Larzans/foundation,samuelmc/foundation-sites,lizzwestman/foundation,adstyles/foundation,ysalmin/foundation,laantorchaweb/foundation,leo-guinan/foundation,dragthor/foundation-sites,Owlbertz/foundation,Teino1978-Corp/Teino1978-Corp-foundation,sitexa/foundation,jeromelebleu/foundation-sites,a-dg/foundation,wikieswan/foundation,asommer70/foundation,claytonrodgers/foundation,stanwmusic/foundation