fixed merge conflict
fixed merge conflict

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